You match the timing belt to the water pump. And ideally you want to be using the b16b/b18c timing belt and water pump. Using a b20 water pump will cause cavitation at high rpm due to it's under geared nature.
Your 22t water pump is B16/b18 so use the itr timing belt to match it.
Also look at using a new oil pump.
Daz