Every night, put some choke-proof snacks and a cup of water or diluted juice in his room where he can find them and take care of any morning hunger, and keep some standard quiet toys for him to play with and occupy himself until you are awake. (Don't give him straight-up juice or sugary snacks, or he will be hyper and louder. It's also less healthy, of course, and sets his taste preference toward sweets for the rest of the day.)
It might take a little time for him to adjust to this. Don't ignore him if he calls for you. If you go to him when he calls, he will feel more secure that, if he needs you, you will come, but he will, as he adjusts to this new situation, be so occupied by his toys and books and things, and his belly will be filled a little, so he won't feel such a need for you.
(I urge you to resist the urge to put a t.v. in his room. Statistics show that children who have t.v.s in their bedrooms do significantly worse in their school test scores.)
So, that's the morning part of it. But as for his bedtime routine, it's much too late. Start transitioning him slowly to going to bed closer to 8:00. If light in his room is an issue, get darker/thicker curtains to keep it out (this will also lower your AC bill in the summer, and the insulation will keep the house warmer, and cheaper to heat, in the winter).
I suspect that he's waking early because he is going to bed *overtired*. It's a common misconception among parents that, if you get your child really, really tired - skimp on day-time naps, put them to bed later - then they'll sleep better and longer. This is exactly the opposite of what happens! When we are overtired (children and adults alike), this stresses us. Think of that adrenaline that kicks in during finals among college students everywhere ;) This is what happens to children and babies who are not rested well enough. They get adrenaline rushes even in their sleep, and, if they're significant, can lead to night wakings.
Make sure that you don't give your son sweets from about mid-afternoon on, so that his body is not revved up and ready for action when bedtime rolls around. Sugar and the caffeine in chocolate can last in the body and affect sleep for hours.
Anyway, I think that, once you get him closer to 8:00 bedtime, you'll find him sleeping till 6-7, and you'll have more quiet time to yourself - at least in the evenings.
For more information on sleep issues, consult No-Cry Sleep Solution by Elizabeth Pantley. Also, for your new baby, have the Dr. Sears Baby Book handy, and if you plan on breastfeeding, I strongly urge you to get a book dedicated to it! Doctors and nurses are woefully misinformed about it. I've been told the most eggregious myths - by doctors! So have other nursing moms that I know. I highly recommend the La Leche League book, The Womanly Art of Breastfeeding. Also, if you run into snags - extremely common in our culture since not a lot of people know how to breastfeed - you can call your local La Leche League group leader, and she or another volunteer will come straight to your house to help - free of charge.
Good luck with everything! Go to the hospital as late as possible. It helps to prevent unnecessary interventions by technology trigger-happy staff.
L.