Oh, man, Aimee! I've totally been there! And I read a little of your thread about moving and can't imagine the stress right now. I would be out there! So, first off, lots of ((hugs))!!
Here's what I know (admittedly, it's not a lot):
Is she still working on canines? My days are so similar to yours right now and my DD is just about to cut either the bottom two or one bottom and one top (can't tell which will come first)! Anyway, if she is, have you tried meds at all? I've found if I do meds, DD naps between 1.5 and 2 hrs, as opposed to 30 min to 1 hr 10 min without meds. So, that may help with a little longer nap. I've heard 1.5 hrs on one nap means OT too; some days I agree (DD wakes up NOT happy), but others she seems to handle it fine, so I don't know.
And the little NWs could be a bit of OT, but also a bit of uncomfortableness due to teeth. It's always a little hard for me to tell, but again, if I give meds, they don't happen, even if I think DD might be a bit OT.
So, I know what you mean about the 2 nap days. For awhile there about a month and a half ago, I wondered if I should just stay with that, because that 2nd nap was always just as long as the one nap I was getting. But, there came a point for my LO where the 2 just didn't seem to work anymore, so I've stuck with one (however, if I get a 5:30 am or earlier, I'm sure I'll try 2). So, if the two work, and she's happier on it, I'd tend to go that way if you get an EW, just because it's easier on you (i.e. less crankiness). Remember, some times it takes more than one day of 2 naps to get a longer night.
But, if you think it's starting to be a pattern of 2 naps, EW, then I'd definitely push for the one. I know it's really tough to bring the nap much earlier, but you might just want to try it, at least once (so you'll know, iyswim). I've been there before too, but at one point (during the last bout of teething), I really watched DD closely for a few days, and realized that she looked most tired at about 5 hrs A. So, I bit the bullet and put her down at that the next day (I think it was 11:40 am or so). I was nervous the whole time and pretty much just sat quietly in the house, and wouldn't you know it, she slept 2.5 hours. Now, that's not to say it's going to magically solve your problem, but you'll never know if you don't try. Maybe you could start with 11:45 am and if you're really bold, try 11:30 am one time.
And, what if she doesn't go longer than 1.5? Well, then at least you'll know, and you can do bedtime between 6 and 6:30 pm that night. Oh yes, I've done that too.

One day doesn't tend to hurt too much.
I'm not sure if any of this helps, but just want you to know, you're not alone. And I hope everything with moving goes well. Remember to take care of yourself!!