@Tod ********
Thanks again to everyone for all the helpful input. We phoned with the Thai embassy in Vientaine just yesterday and they confirmed that they are issuing Non-O based on retirement for foreign nationals. And they confirmed that the requirements according to their website are up-to-date. So I am confident, that it would work.
I have just one question left and if I could get some input from people who know and not just guess, it would be great, too. On the eVisa page of the Thai embassy Berlin they write that the application can be done only, if the applicant is doing it from Germany. As said, I would prefer to do it while still in Thailand because my stay in Germany is 9 days only and I don't want to risk not to get the visa in time (they write it might take 15 working days). Does anyone know on whether this requirements will be checked/enforced?