My car has an M30, but the clicking is what I hear when the battery is drained. From all that cranking you definitely drained the battery, I'm not convinced that there's anything wrong with your starter. With the M30 at least, I know even with a professional jumper there still wasn't enough power to start the engine, it needed a fully charged battery and then it started up. That doesn't address the original problem, but I think your starter issue is just the battery.