Yeah, I agree, and that's one problem with focusing on what "intelligence" means: it kind of connotes, as you say, abstract or academic problems over practical shrewdness. (It doesn't have to have this restriction but people sure seem to take it that way a lot.)