is she crying at all during this time or just talking to herself? if she's just playing, i would actually leave her to it. sounds like she's quite proud of her new skills & wants to practice. if you let her practice, the novelty will probably die off quicker, kwim? if she is crying, the toddler pd is probably your best bet, knowing that it will take a LOT of it before it starts to kick in.
as far as when to wake up, i would keep that as consistent as possible. with mine, i was always fine with a wakeup anywhere from 7-8am. if they weren't up at 8am, i would wake them up then so i could get all the naps in during the day. (this didn't apply to a sick baby!)
HTH a little