If that's the case he'll need a new Non Imm O. Ive only given the options if he currently has a Non Imm O visa or is currently on an extention of stay from a Non Imm visa.
If you're already on a marriage extention of stay, you can cancel that at your local immigration office and change to a retirement extention providing you meet their requirements.