mate, night waking sucks doesn't it? I think if one person had the answer to get every little bub to sleep a whole night they'd be a rich person.
If she's still BF well, I wouldn't be too concerned with the lack of solids you feel she's having. I'm pretty sure it's a fallicy that a full belly will help them sleep better.
Noone should get used to wkaing at 2am but sadly I think's it's a 'this too shall pass' phase. One of many more she will have. There's a lot going on in her little brain that's she's processing and I'm pretty sure it's common for them to start waking around this age again anyway.