@slanginsanjuan - have a solution for your leak.
I did this mod the other day, and ended up re-using several of the stock hoses to make it work, one having a sharp U-joint on it.
Fits like a glove and temps are rock-solid.
I'm doing a small write-up about it and will post in a few.
- dc