Brandon Sanderson tickles that itch for me. His Mistborn series is really fun and has some rudimentary magitech without really spoiling anything - all of the magic works in specific ways but how people interact with it changes over time as people learn new (mostly martial) techniques. His Stormlight series has a system of magical doodads that ultimately evolves into full-on magitech, in addition to the kind of magic ninja stuff of Mistborn. Oh also magic mechsuits.