I always thought that "geek" described all those things, and with some level of intellectual accomplishment. Wheras "nerd" was a more obsessive, less self-aware form - like people who know all the stats about a particular comics character.

But apparently I have them reversed in my head, for reasons that unsure of. Perhaps growing-up in a country that was not then saturated with US pop-culture is to blame. Etymology references arent particularly revealing in this case, as they just tell me what I already know.

Yeah, growing up in New York it was the reverse of these.