It's a time-consuming pain but something you can wrangle, and you can (a) avoid things that'd complicate it further, (b) have an easier time once next year is like last year (mine isn't quite because I've bumped above a new threshold).