Yes, that's more the theme I'm looking for. I actually picked up the JR set of that. Also, puzzles like this http://www.amazon.com/Think-Fun-6820-ThinkFun-Gordians/dp/B000EGI4OO/
Kids borrow these toys for about a week so having different types of toys (beyond legos and erector sets) is what I'm looking for.