I'd argue the ideal hacker is multi-disciplinary. Certainly, a lot of the computer hacker (good kind, not media kind) culture comes out of electronics hacking (amateur radio, the world famous MIT Tech Model Railroad Club, etc.). Some computer hackers are fair mechanics as well, because grokking your car or motorcycle or other complicated mechanical conveyance is cool.
Makerspaces obviously make some accommodation to soft hacking, like software development or network stuff. You just don't need big obvious tools like drill presses or 3d printers to do that.
I find "maker" pretty appropriate, although it lacks consideration of the "unmaker" kind of hacking: taking something apart that someone else made for the purposes of understanding it. Maybe remake it to your liking, maybe just drop the parts in the reuse bin.
I wish we didn't have to back away from "hacker" because of all the damn stupid barbarians with their damn stupid swords co-opting the word.