Thanks for the advice ladies!
Ali, I have considered pushing the DF a little later, but I'm flat out staying up to 10pm to give the feed! I'm not a night owl and would be quite happy going to bed at 8.30! I wonder whether I'd get away with giving only one feed (probably around midnight) between 7pm and 6am if I dropped the DF? We've just weaned his dummy, so unfortunately I don't have that option anymore. I was going to use DH to settle so he doesn't smell me, and yes, if he doesn't settle easily, then feed. Maybe I'll try just offering one side when he wakes and see how that goes?
Maria14, I guess I don't mind feeding at 2-3am because at least you avoid the situation you were in, in that LO would wake early morning for a feed and then have trouble going back to sleep and/or it throws out the beginning of the day. I know if I wait a while it will probably change (that's parenting!), but I was hoping to speed up the process

Fiver, I'll see what waiting a little longer in the morning does. He currently wakes and babbles away in his cot and by the time I'm up and get to him, he's probably been awake 15-20mins, but I'll see if I can stretch up to 30mins. The idea of offering water was only to see if it satisfied his thirst during the night, but using DH to settle instead of me may work too. I'll see how holding off the morning feed goes....