@Tony *******
I think you are mistaken a bit. It sounds like you're currently on "amnesty"<- meaning what ever entry stamp you had expired and you're allowed to be here until the 31st of July.
IF that's the case you can't apply for an in country Non-O visa because you need "hard stamp" days left on your passport not fairly tale amnesty days :O.
The O/P has a 60 day visit thai family extension (which anyone who is married to a thai can apply for and which does not require proof of funds AND which you can apply for from amnesty too).
With that extension they then have the required "hard stamp" days left on their passport to apply for the in country 90 day Non-O visa