Nice! My LO has that sleep schedule and it is awesome! She gets up almost everynight at 4am because she wants her paci back but then goes back to sleep until 7am. She isn't really awake awake at 4am - her cry is very different when she is awake and hungry.
Have you tried a sleep sack? It prevents them getting it up over their head and I know I sleep better because I don't worry about it like I do when she is napping (or attempting to nap) with a blanket swaddle.