Sorry for the delay!
To make a long story short, nothing was working. She was still resisting naps and really resisting sleeping at night and continued to wake at 12, 3, 6 and so on. Just exhausting.
As of last night, I decided to try some WI/WO. It made everything worse. She just hated it. She woke up a couple more times than she normally would have and had way more trouble getting back to bed.
We've been putting her down for her nap much later. Around 2:30-2:45 and we do something super active right before and that seems to have helped. She naps for 1hr-1:45 minutes and we're good to go! So that's way better.
Today, however, we figured something out. She apparently hates when we close her door now. So I told her that I would be just outside the door, but that I would leave it open. I leave it open about 45 degrees so she can't see that I'm not actually there and she went to bed on her own without any fuss for her nap. I just tried it for the first time tonight and she went down right away without a fuss. So we'll see.
I can't believe that something as simple as the door being left open might be the trick. We'll see. I'll update you!