[KLF]

I think you are confusing the oil pickup tube for the oil pump. Unlike the 2F that lives in the pan and driven by the distributor, the oil pump in the 22R-series engine is a crescent-type gear pump, it is driven from the front of the crank.

So, all you need to do is also swap the oil pickup tube and screen. You have to do this because the 2WD pan has the sump in the front, but that will interfere with the 4WD suspension. The baffle in the sump is really important, it keeps the pump from sucking air when in extreme angles.