last i saw no one makes a complete aftermarket oil pump housing for the h22. Only a beefed up oil pump gear. That would be the prodrive one. look into that.

And as far as aftermarket water pumps go, the only one I have see is the electric ones, like Meize or GE. Those are not direct drop ins either. Your gonna need to route the electic pump inline, and wire it up with a thermo switch or something, cuz using an electric pump is not the same as a belt driven pump, because it doesnt flow with respect to the rpm.

And honestly there is nothing wrong with a stock water pump, or oil pump, I haven't seem many fail prematurely.