And also wasn't Shirou's inability to use other magecraft a product of him never using his real magic circuits and ruining his body turning his nerves into a circuit? He might not be able to do much of Waver's magic but at least he shouldn't be a one trick pony. Don't get me wrong, sword spam is awesome, I just think someone like Waver would round out his repertoire a little.