I want to get rid of the mess under the intake as well. I am not sure whether to go the cap route, or go with a hose that connects the heater manifold to the nipple in the engine. One snag on this is the manifold is, as I understand it, about 5/8 of an inch, while the nipple on the head is about 1/2 inch. Has anyone tried using a peice of expansion hose, where it has the larger end and then goes down to smaller hose? Its about 10 bucks or so for the extra hose, but you can probably use the other part too on your fabrication of a new system. I just may do that, when I buy all the other hoses and gaskets and stuff to do this job so it lasts a while.
Geoff