Yeah, today was spent aligning the front derailleur, turned out to be the bottom bracket - that was an epic battle, but Shimano won.... I measured the original bottom bracket at 124mm and bought a 113mm Shimano to match the crankset. It's finally all installed. If I had gone to a shop, it would have been weeks before I got it back.

Now that it's all back together, off to see if I fixed the regen. And get ready for tomorrow's commute...