I asked a long-haul air steward how she coped with jetlag and her answer was to immediately move on to the time zone you are travelling to as soon as you get to the airport. If possible deprive yourself of sleep so you can sleep easily on the plane at the correct time. I've followed this advice and I time adjust within 48 hours. The worst thing you can do is to have a sleep when you arrive if it is still daytime and don't keep an I on the time back home.
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