Which oil pump

If you've had no issues with the rpm yet, I'd keep the clearances. But if I was building an engine for you I'd be going .002 on the mains and .003 on the rods for that rpm. I terms of oils, I'd run mineral oil 15/40 or synthetic 5/30.