Pretty simple isn't it, have to add in a pressure valve at Hose Input, (mains) and you missed the temperate valve, that unit that makes hot water warm it would be located between HWS and hot outlets with a cold line running to it as well. On some vans you will find a T piece off one tank line which will run a line to a hand pump on sink, that way if you are on town mains, which is usually rubbish and your tanks are full of sweet tank water from home you can access your tank for drinking and use the mains for washing stuff alternatively if you have one tank with rain water for drinking and the other tank is with town water you can use it for washing and still get your drinking water from the other tank by hand pump, though some will put another 12v pump in.( water for coffee, beer for drinking.)
I do like what youvé done very nice layout, you wouldn't believe how simple it is by laying under your van and looking. I repositioned my water pump, a great way to work out what the hell is going on.