Your suggestion to swap the starting weapons of battlemage and Inquisitor makes sense for both presets, but I think you're putting an excessive amount of weight on a single +2 Racial Bonus to STAT, when you get +2 to spend each level and gear has boosts as well. Yes, that +2 is helpful, but not make-or-break.
