At your local hardware store you should be able to buy
a "drill powered pump" for 7 bucks or so.
It connects to short pieces of garden hose and with it
and a battery drill you can pump the water
out of the carry jugs and into your tank without killing your back
Once you get the water in there you can fill the water heater
by turning on your trailer water pump and opening a hot water faucet
to let the air out.
I suggest carrying drinking water in a blue jug for the first
couple of outings. The foam and funny taste left over from the
antifreeze will lessen considerably after a few days.
Sounds like you've got the rest covered pretty well.
Good luck and Happy Camping!!