Can she really be up for 2.5 hours after 30 minute catnap?
And this other plan you have, is it without catnap?
I think I would go for fist plan, let he take catnap 5.30-6 and wake he from last nap when needed then.
and make bedtime about 7.30
Jut my thoughts