Why would you not just renew the extension another year rather than expose yourself to the horrors of an in country Non O visa application and it's requires?
Glad to be able to share my discontent here and not have my post deleted. Also to open the eyes of others to the little discussed details of options, as you mention. As to the rules changing, well, over 10 years of my observations they do change. Unfortunately rarely in favor of the hapless immigrant.
Thank you the clear guidance. A question more. Once you return and stamped back in with the re-entry permit, when preparing to make the 90 day report, will one need a 'fresh' TM30 or just the TM.47 is enough?