@Gad ******
if it's going to be after your Non-O extension expires and you have time get the 90 day Non-O visa from the thai consulate online before you come back, then you'll get 90 days when you enter and just have to go for the extension 2 months later 🙂
Cuts a few steps out of the "show up free stamp and start from zero" process