Indeed, I never needed a Certificate of Residence because my yellow house registration book served the same purpose for address confirmation (in Buri Ram).
Non-O and Non-O A are both visa for retirement. Non-O based on marriage with Thai is also an option. However, Non-O A is not recommended because of required border run every 90 days.