@Robert ******
I have mixed feelings right now as this makes me really happy and overwhelmed, but I can't believe the visa agencies who told me I needed to do a visa run to get the Non-O and the immigration itself that discarded my proof of funds when we came there to instead offer me an extension of stay rather than the conversion. Maybe they figured I didn't have enough time left on my stamp to do it 😁
Thanks for your answer!