@Joe ********
No if you got an extension within Thailand you have until the stay permitted date stamped into your passport. Also if you leave without obtaining a reentry permit the stamp is no longer valid. If you got a Non O at the embassy outside of Thailand you can come back in 1 day before your visa expires and get an additional 90 days. If you have a Non OA it's an additional year