My daughter's exactly the same, almost down to the same waking times.

Do you bedshare? I find being able to drift off during her night feeds is a godsend. If she wasn't in with us, I'd be running on empty most days. In fact, the night before last she didn't even need my boob in her mouth to go back to sleep for one of her tiny feeds. We were in an awkward position and as I started repositioning her, she grabbed my face, licked my cheek, and went back to sleep!
Lol. That's super cute.

We substituted bfing with water for ds as my milk ran out. It took a lot of screaming and about a month but he eventually happily started waking up and sorting himself out. He is now hopelessly attached to his "beer" (water, he calls it his beer because the water bottle has a stubby holder on it like dads beer *sigh*) tho and takes it to bed as a comfort item.