LA Engine with Magnum heads and intake??

Hi guys, I am running a LA 360 with Magnum heads and magnum air gap intake. Im wondering about 2 things.

First the Bypass hose. I picked up a standard LA bypass hose and because the air gap intake port is straight out the bypass hose is kinked and will not fit at all. I am running the LA water Pump and not sure if I have to swap to the Magnum. See the pic.
View attachment airgap.jpg
Im curious as to how you guys are running yours or how to fix this?

2nd question. The water neck. The only water neck I can find to fit the intake is a stock neck from a '00 Ram and it is seems very tall. View attachment water neck.jpg
Where can I find a shorter neck that will fit like a LA neck.