[Mustard72]

You could always add in your 33 gal tank from that compressor to boost the volume of a new compressor, too, so you can maybe not spend extra money for a bigger tank. I'm planning to do that with my old 20 gallon horizontal tank from my dead oil-less compressor. Just need to be able to drain it. I think anything that's not an oil-less compressor will be much quieter than the oil-less one you are running now. I was almost happy when mine died.

I need to make a water trap system like you have. I run a hose straight off the compressor now with a cheap tiny water trap right after the regulator, but it's really woefully inadequate.