Hey Amy! Wow, it is one thing to hear about your DDs short naps and another to see them written out like that. That really is rough.
I do agree with Sabrina that she might be ready for a longer A time. At 5 months she can be good for anywhere between 2-2.25 hrs, getting up to 2.5 hrs at about 6 months. So it might be worth a try to push the naps 10-15 minutes later, and see what happens.
As for tonight, that is a tough one. I would try for the catnap, though, because otherwise that bedtime is going to be really, really early. But it is up to you in the long run!
I am not good with time changes, but I think we may be a bit late chiming in on this... if so, what did you end up doing?