@Eamonn ********
it is as easy as you make it. I don't understand why you'd get a tourist visa first if it is actually non-O that you need. Then you should apply for non-O in Laos.
By the way, can't you switch to the retirement year extension in country from your current ED extension? Maybe go to your local immigrations office and ask them that. Saves you a bunch of hassle. Because what you're planning now makes very little sense - you want to use the new feature to switch in country, but from tourist, which requires doing the non-immigrant version first, then to get tourist you need to go abroad, all while the feature to switch may be available to you right now with your current extension (and skipping the non-o).