If someone has a Non O visa based on marriage or retirement then the first extension needs to be based on that.
Ongoing the extension can be changed. Example from marriage to retirement.
OP, why not obtain new Non O retirement for next visit.
Regards agents... Most likely an agent can obtain extension based on retirement from an entry with a Non O marriage.