The old/new version relates to the business class reconfiguration which I think is standard for UA
international flying with maybe one exception used as a backup, so plan on a "new" configuration layout. That said, if memory serves me correct the misaligned window issue begins at row 22. Rows 23 and 25 are definitely misaligned.....I remember the window at Row 25 is forward of the seat so you'd have to lean forward but Row 24 does a better placed window/s.
Row 24 my pick for you if you can't get 20 or 21. Row 19 is good window-wise, but has the tray table in the armrest resulting in a bit more narrow or tighter feel to seat. Row 20 the best in Y+.
The other option.....back rows with the 2 seats but obviously not Y+ seats you've likely already paid for.
Hope this might help,
watch what you want. you may get it.