My setup is (well, was) exactly like your pictures and description describe, so you've got it right.
A good overall engine picture of your setup might help.
The water choke on my setup hooked to the intake right near where the throttle linkage is, exactly like your first picture, and then it went straight to the carb, and then out the pass side of the carb, to under the intake (forward hose), and then to the back of the water pump via the metal tube.
I'd get you more pictures, but my truck isn't put together yet from some work I'm doing.
