12 Nov 2016 Edit:
Problem fixed. Followed DIY here
http://www.m3post.com/forums/showthread.php?t=1197330
FYI: The 2 starter bolts are not E14, they're E12
Not that bad of a DIY. Hardest part is NOT removing the starter bolts, but messing around with the engine wiring harness. I did this with a buddy and spent 8 hrs on it since we went slow and cleaning things up as we went along.
The original starter was an OEM Valeo. Purchased off FCPEuro an OEM Bosch. I think the Bosch is a tad bit heavier. Valeo had a two cracks on the starter solenoid
I made my life easier by climbing into the engine bay and sitting there while I used a 12" flex head ratchet to get the starter bolts off. The breather hose is a PITA because it gets in the way, but very doable.
Here's what it sounds like now: