Sounds very similar to ours that at 2.
She dropped the nap a little earlier and helped her get longer nights through, with odd wake.
Now she’s come on a bit and she’s much better – think it had something to do with being dry in the night that’s really helped.
Although, something new has reared its head and she’s waking 3-4 hours into her sleep at the moment! Always something. Not sure on cause to be fair yet