I totally understand what you're saying and trying to do but it's way too easy to fall behind and chase. I tried and ended up basically in the same spot but with added stress. Granted, my position isn't as large as yours but now I know to just leave it alone.
If everyone can wait till 2020, this type of conversation won't even be needed or remembered