Maybe you ought to consider sleeping later. When your first nap happens at 7:24 am, you might think about shifting your nap into your night and letting Momma get more sleep too. More sleep for Momma can only be a good thing. Less crabbiness, more energy to play with you, and a longer fuse might benefit you greatly.
Just a thought.