Opened a new account on Wednesday. Saw many foreigners in the same bank branch at the same time with a variety of agents. As far as I understand they were all applying for non-o visa changes leading to the retirement visa.
Get a visa for the 3rd entry is the best option. By then those immigration officers at the airport will whine at you or deny you entry if you use a waiver.