Just an update with this.
We implemented some changes into our routine and they are working really well. We have dropped one feed overnight and our other sleeping problems - having to be rocked to sleep, catnapping etc have also gone. The best thing is we did it without crying (me or him!).
He also has a new thing. He now loves sleeping on his side. It is soo cute with his little bum on the side. What is it about babies bums that are sooo cute?!?