Thanks for the advice chromis, going to check out something local this afternoon
Edit: Checked the car out, fires up right away (no long crank), checked work done under warranty at local BMW dealer and the pump has never been replaced. The cam and solenoid (?) was replaced however at ~30k, car now has 40k on it and warranty until December of this year. Hopefully my Hyundai sells soon so I can get into a 335i, damn what a fun car