All of the above are good. Here are some thoughts from a discretionary trader:
I would simultaneously learn some form of martial arts.....tai chi, karate, kung fu...whatever....learn ZEN. Learn how to play poker. Learn the rules of blackjack, especially regarding bet size. If you don't know yourself more than the average joe does.....you are going to have trouble. The same if you BLINDLY follow crowds...leaders are a different story. Do whatever it takes to make you tough. Get physically strong, if you aren't already. Learn how to listen. Learn how not to listen. Knowing what is going on in the sports world helps. Picking teams, picking markets...same deal. Learn how to identify an edge in everything you do, classes, relationships, everything. As far as math, however much you study, make sure you walk away with an intuitive grasp of what it it.
Do everything in your power to improve your memory, if it is not already fantastic.
You are undertaking a long career. Quants are the in thing now.....and maybe it stays that way, but you want to develop the savvy that it takes to be come a real good trader, it's the other stuff that is gonna kick you up the notch it takes to get there.