Glad to hear ya have long-erm ownership goal for the car. I am headed off to bed but read your post and wanted to see if you know of the folks at
https://5150autosport.com/.
I was working with them on forged parts list for my car right before I blew mine up and needed a new engine. They were very friendly, very informative and were very price competitive. Give em a call or email.
Yes do a new pump and consider using the F90 if you can.
__________________
2015 F06 M6 Silverstone Metallic II, Individual Full Leather, B&O, Night Vis, CCB, RKAutowerks (CP Rods/Pistons, DI Cams, CF Intakes, Coated DP's & Billet Diff Brace), InfinityAuto Turbo Inlets, Mishi Oil Cooler, JB4, XHP S3, BM S3