Thanks for your advice Jennifer.
Nox, I think I will take the same approach as Jennifer and to a degree last night I did! When he woke i took him back to our bed and gave him his boobies, after that I did not let him again until morning! He did cry a little but I was right there with him giving him cuddles and the crying (or whinging really!) only lasted for around 5 minutes.
I'm still thinking about whether I will move him to a toddler bed.
Have you decided what you think you will do?