Boo for the short nap!
Try keeping her at 3 hrs for the second A time tomorrow. Wrt bt, you can bump it earlier just a bit. I wouldn't do a super early bt since that didn't really work well previously.
The other thing too is making sure she gets enough physical activity during the first 1/2 to 2/3s of her A time so her body is tired. I had to do this with my DS otherwise he short napped on me even with the right a time. The final 1/3 of his a was really low key (mostly reading books, looking out the window, etc) so he would be ready to sleep.