I agree with two points of Claires' and Susies.
First off, yep, remind everyone tomorrow is your real birthday do what are they going to do? Maybe you should tell them that since it is your birthday and they gave you this lovely surprise you want to surprise them and then you choose something you want to do and say it is all for them.
And secondly, yep, I don't think it is fair he got mad at you. That is poopy. But, like Claire said, boys are hard to apologize. Especially when he put so much into it. He can't admit he had the freakin day wrong!! He thought he had it perfect. To admit he had the day wrong {you can laugh about this the day after tomorrow or tomorrow while you are celebrating again} is something he can't grasp.
But, on the other hand~
A very very {early} Happy Birthday!!!!