Yes I was considering some kind of water table too. It's tricky, we're immigrating a week before his birthday so might get the balance bike and water table shipped and get him something I can take on the flight. The big gifts will not be there for his birthday though.
So if anyone has some smaller things that come to mind?
Definitely getting him a Buzz lightyear.
Does he actually like Buzz, and want this? I only ask because I bought my kids Buzz and woody thinking they'd love it, because "I" love Toy story...yeah, they never played with them. They were really expensive, too, so just thought I'd throw that out there to make sure its an actual interest for him, and not just something you like and hope he does too. I learned that the expensive way, lol.
ETA: Definitely do the water table if you don't have one. Seriously one of our best purchases ever for the boys. They literally play with it every single day in the summer, and my oldest is now 4.