Anyone know the visa options for the below....
Im a UK citizen, boyfriend is an NZ citizen. He is curently in the UK on an unmarried partner visa (as my partner), the 2 yrs prior to that he was here on a working holiday visa living with me.
OK, we are now engaged and getting married next June 09. The unmarried partner visa expires in May 09. He will have 4 full years and 3 months here then.
OK, what are our visa options? (without having to get one, then another then another) also am I correct in assuming we can marry on a unmarried partner visa if we have the Certificate of approval of marriage to take to the registry office??
Geez, getting married is hectic enough let alone the added stresses of visas!!!

Thanks in advance