Thanks for that!
I started that forced sync a couple of hours ago. It kept syncing for a while (as you suggested), but now appears to have settled down. The activity log is very cryptic (and I look at logs every day for a living), so it's hard to be sure completely what changed.
I'm glad I didn't have to reinstall. Thanks.