The New LS/water pump should be fine, from whati know, the gsr,si and b20 oil pumps flow the same, but a type-r one floes a little more oil...,just use your b16 one, and if you get a chance,get a pro/drive oil gear. we use pro-drive gears in all our turbo carss and have never had any sort of oil...