@Mika *******
you can't apply for the Non-O until you bounce out and back and get OFF the elite entry stamp and all the extensions from it and come back on a new stamp.
AND
To apply for the Non-O visa inside the country there is no seasoning of the 400K baht funds, it just has to be in the account the date you apply, so until you can get out and back and THEN begin the process there is no gun to your head to get the funds in now.