Okay, okay, it wasn't that bad, just time consuming.
It's all back together and actually went back in fairly easy. (Hopefully I didn't just jinx myself by saying that.) Anyway, did the test drive and all good with the exception of the motor did get a little hot for a brief period. I think...