All great stuff. The other thing you can do is try to reset your body clock by going to bed early, or (if you're brave) skipping sleep for a night, then going to bed early next evening. The former is better as the latter messes you up for a few days but if you have the time will be quicker. Then keep going to bed at around 8-9pm, you'll be up before 6am quite easily.

I'd also recommend drinking lots of water and a large glass before bed.