WDH trailer loading adjustment

I know and have read many times that when adjusting a Weight Distribution Hitch (Equalizer in my case), the truck and trailer should be loaded as if hitting the road.  My variable and hence my question is whether to adjust with the 35 gallons of water or not??  Some trips we go to full service CG's and I don't load it down with the water and some trips are with a full tank of water.  The 179 has its tank between the axle and tongue.  Is it better to have that extra load during adjustment, then without the water the hitch could possible be over adjusted?  Or better in the other case in which it would be under adjusted?

Also, more weight in the FW tank on the 179 means fewer sway issues.

Actually, 36 gallons since the tank is 30 gallons and the HWH is 6 gallons. Possibly a quart more if you count what is in the water lines. 

Actually it lists capacity at 36 gals. Which the water heater is part of. The grey and black are 30 or 35 depending upon model.

Pardon me, but the 6 gallons of hot water are also in front of the axle in the 179. It may be different for other models, but I think it applies for the 180 as well. The black water tank is also in front of the axle. The gray water tank is behind the axle.