Not got good advice on the general question, but very much disagree with:

Math is instrumental and something you will pick up as you go along.

You need to self motivate yourself strongly to pick up new mathematical fields to the level where you can contribute. I'd make sure you had math courses in formal logic, whatever else you had; that would make it easier to learn the relevant stuff later. It also helps with thinking about these issues.