I did e-visa at the Thai Embassy in Germany before I left Thailand. I got approval and visa but I had to show booking Germany Thailand. Also immigration on arrival in Thailand checked my inbound boarding pass.
don't worry. You have an extension based on an Non -O- visa plus an multiple re-entry permit till your extension will finish. Don't forget to reapply for a new extension well in time with all requirements.