I agree with every point the OP makes. In addition, I suggest raising the exp reward from Battlecraft leves to equal that of Tradecraft leves and possibly adding optional HQ goals. When I'm getting 3k exp from a Battlecraft leve and 12k exp from a Tradecraft leve of the same level, there's a flaw somewhere.

(And no, it isn't because there are fewer ways to level tradecraft disciplines; combat disciplines don't get 1800+ exp per kill, so it isn't a matter of trying to balance leveling speed.)