B.Z.
I find this question very interesting. The social norm is that dolls are for girls. It appears that you choose to go against this norm, yet you give into the "pink is for girls" norm.
I'm not trying to be argumentative, as I went through a similar thought process a couple of years ago when my son was about the same age. I ended up buying the cheapest doll. It happened to have a yellow and pink frock. So what? My goal was to teach him about caring for others and give him the opportunity for some roleplay and make believe. Goal accomplished. I got my son an Ariel Barbie for this Christmas, and he'll be 4 in January. He told me a couple of weeks ago that Barbies are for girls, and I challenged him by asking why can't boys and girls can play with whatever toys they want? He told me that the older girls at his school told him that he couldn't play with the Barbies when he asked if he could play with them. Sigh. IMO, society and hormones will teach my son enough about how to be a strong man in the world. But to be a leader, he needs to have at least one safe place to explore and challenge stereotypes and social norms.
As far as gender-neutral or boy dolls, sounds like you got some good suggestions earlier. Good luck and happy shopping!