Getting Felix to sleep through - the wibble in the middle

So after our amazing nights' sleep we sort of wibbled a bit. Felix is still sleeping long stretches - 7 to 9 hours, but not the 10 - 11 I really need. Instead, he's been waking between 9pm and 10pm and I've been feeding him then and he goes through till about 5am. And I've been a bit lax about making sure he doesn't feed himself to sleep during the day too, which doesn't help I'm sure. So we're going to sharpen our act up again and get back on track.