Currently, my trailer's water supply is a hose hooked up to a hydrant and then coupled to a connector on the side of the trailer.  There is no tank or pump.  Turn on the kitchen faucet and I have water, however it leaks badly.  Probably due to too much water pressure.  A pressure regulator will probably fix that problem.  There is also no gray tank to hold the waste water, it just drains on the ground (I usually put a bucket underneath).  I bought the trailer with this setup and it works fine for most small show grounds where I'm parked in gravel or in a field, but a lot of places won't allow this. 

I would like suggestions as to the most economical way to change this setup.  Hot water would be nice, too.  I just bought, but haven't tried yet, a commercial coffee maker.  I thought I could heat my water in it and place it on the counter with the spigot over the sink for my hot water supply.  I have a porta-potty and solar shower setup in the back, but if I had hot water inside, I could at least do a sponge bath on cloudy/cool days when the solar/bag shower water wouldn't get warm enough.

Thoughts/suggestions?

I have heard good things about these:

http://www.americanwaterheater.com/products/pdf/lpe70.pdf

Don't know about the waste water issue. i would contact an RV service center and ask for suggestions..