Just use a new water pump supplied by GMH for a VSIII if they still have them. It'll mean a WB pulley but so what?

Original inlets are easy to find so i'd get one of those.