@Willy ********
you should have no problem changing from marriage extension to retirement
You're right it's a LOT less paperwork and you get the retirement extension issued the same day you apply rather than have to go back in a month to get it inked in
Between now and when your extension comes due just ask your office for the hand out for retirement extension.
Most offices are only too happy to have to switch because it's less paperwork for them too ๐
Best of luck with it,