What we have here is a failure to communicate.
You tell him your bday is no big deal, and he believes you. It gives him an easy out because you take care of everyone else, so he assumes you will take care of yourself as well. So he focuses on his son, the Easter baskets, and so on. So you MUST STOP telling him that things are no big deal and then getting upset when there's nothing. Stop hinting that you want Restaurant A and then being annoyed or disappointed when he picks Restaurant B.
But I think there's more than that going on here. He seems to use the idea that you'll "have more time together" as an excuse for him to do as little traveling as possible while you jump through hoops, get your daughter, and drive to his place. That's your regular Friday night routine too? Why isn't he driving? Why, when there's no reservation made by him for your night, do you try to make one somewhere else (and find they are booked), and then you "wind up" at his favorite restaurant? If he was "going to get you a card" and then "ran out of time," make a list of all the things he was doing to use up that time. All of those things are more important than you are. Remember that.
Why are you overdoing it by spoiling him with expensive champagne and upscale hotel rooms? He is buying an $800 watch when there are children to educate and two households to support? And you're teaching the kids that a "nice gift" is $75 cologne that no child would ever pick out on their own, rather than a handmade card or a kid-decorated photo frame?
I really think that HE values being spoiled financially - so it's your job to do it (lingerie, expensive everything) and it's also his job to spoil himself (watch, his restaurant). You aren't on anyone's list: not his, not your own.
This is going on because he does it and you allow it. In fact, you reward his negligence of you by buying him big stuff. Are you trying to "show him" how to prove love and appreciation? He's not getting the message. He's "hearing" that you think he deserves all of this, and that you think you deserve none of it.
You are going to raise a daughter who thinks the same thing of men: that it's her job to service a man with all kinds of effort (driving all over no matter how inconvenient), patience (waiting to see if he has time for her), and money (buying expensive things).
I can see why he wants to move back in with you - he'll get a woman in nice lingerie who buys him great stuff out of a limited budget, who demands very little, who is "happy for him" when he splurges on himself, and who is content with whatever attention he throws her way when it's convenient.
What I can't see is what you value in this relationship. You have said nothing about how he spoils you, puts you first, makes an effort on your behalf, or anything else. Sorry, but I don't see the 2nd round of your relationship going any better than the first round. You aren't even back together, and already you resent him and know that you will never, ever come first.