Hi,
sorry i have no advice. My DD is 13 months and is doing pretty much the same thing. I have been wondering about this because I don't really want to actively night wean but sometimes it feels like i will never get a good night's sleep again! I hope your little one starts to improve soon.