The online non imm O e-visa is pretty easy and as you already have seasoned funds there is no reason to consider any other type of visa. I expect your current METV will just be cancelled when you are granted a Non O. Your Non O will be for 90 days and you can apply for the retirement extension up to 30 days before it expires. You must be able to show the funds came from abroad. On the non O application they ask for proof of residency in your home country so just upload your DL or your passport again as both are accepted
You can buy an onward ticket for about $14 and avoid all the hassle. It lasts for 48 hours so buy it just before you fly. There are many sites offering this service. onwardticket.com