My 2 cents is different. If the fuel pump goes bad, you coast to a stop and you replace it without any special tools. If the oil pump goes bad, there's a risk of destoying the engine when you lose oil pressure. An oil pump is also much more difficult to replace than a fuel pump. You need to drain the oil, drop the pan, and work in tight spaces between the cam and the block. I'd replace the oil pump now, while it's in the shop and you have a comfortable place to work. Again, just my 2 cents.
