I think your DF is too late, Tracy recommends that it's no later than 11pm as it can disturb sleep rather than help it. I'm not sure that 6/7am is really a nightfeed - that's when most babies seem to be up for the day. Would it be worth shifting bedtime to give you a 12 hour 7am - 7pm day or does 9am - 9pm suit your family better? He is going 5.5+ hours from your DF - that really isn't bad for his age and size!
Laura