To anybody that finds this through the google machine, I have a bit of a write up about how I got this syncing up quite nicely, linked here:
There's a lot of reading, but the time needed to go through it will be an absolute fraction of what was spent on gleaning all of this information. If you want it to sync good, take the time to go through it well. (And feel free to reach out, I'd be happy to share notes)
