Need Opinons on Oil Pump Replacement

[DiertyEuroSpec]

I am about ready to put my replacement motor into my car. While its out I have dropped the oil pan to replace the the pickup tube. I am now contemplating if I should replace the oil pump just because I am there. The motor has 150K on it and I assume its the original pump. Everything looks clean no signs of sludge or anything like that. I read the oil pressure survival thread and you can test with a feeler gauge which I will do today when I get home. This is the correct place to measure correct:



Doing the J-plug, rear CTS, oil cooler o-ring, any tips on what else to replace while its out. Thanks

[Audi body]

Yes it looks to be the place. From everything I've read the pumps really aren't the problems. Just the pick up tube. I have heard about non oem pumps causing issues.

[diagnosticator]

Careful measurement will determine if the pump can be reused. Otherwise, replace the pump. It's not expensive, and accumulates wear despite being an oil pump.

Replace the drive chain and chain tensioner also.

[DiertyEuroSpec]

I was plannig on pulling the front crank flange so it would only be the pump. I did buy the tensioner but didnt realize the front flange had to come off. D in that pic I posted that is the correct place for the feeler gauge between the inner tooth and outer flange?