Re: pp1, you've got the idea.

Re; pp2, get both the housing and the pump from Mopar, save weight and get better flow.