I received very helpful advise here and just wanted to say thank you and confirm that a person can get it all done in one day right now. I was able to move my stamps to my new passport, get my annual visa (26 days before it expired) at the same time and still have time to get my 90-day reporting done with the new passport. Two locations, one day. Queues were relatively short; we arrived at immigration after it opened at 8:30am and still only had 30 people ahead of us so took about 90 minutes plus 90-day only took 30 minutes from arrival to exit. One of the most painless visa trips ever.