I know it is a long shot, but I was reading a thread about the rotor magnets (from 2016), and you mentioned you had spares. Do you still have any? I am fixing up my charging system, and noticed one was chipped pretty bad.
Craig, saw your post re fender extender...where did you buy yours? (I'm in Waterloo, ON -- am planning to ride up to Ottawa tomorrow to visit my brother -- here's hoping the weather holds!)