Best way to move from energy trading to ER?

I posted this in the Asset Management forum as well. Sorry for the double post but this forum might be more appropriate.

I'm in my early thirties and have been an energy trader for almost five years now. Purely spec trading. Love macroeconomics and fundamental analysis.

I've always had an interest to work at a mutual fund/pension fund doing research, perhaps focus on asset mix strategy, and maybe someday being a fund manager. Preferably fixed income but not sure how to get into that niche. I live in Canada.

I have two undergrads. Comp Sci and Economics. My last degree gpa is 3.7 and my work experience is good. Five years finance consulting. Five years energy trading/research (spec trading, not hedging). It's time to pursue a MFIN, MBA and/or CFA and new career.

My question is:

Suggestions for a next step. MBA or MFIN? I'll do the CFA regardless if i make this move. MBA appears to open doors while a MFIN would probably give me a stronger finance background.

Rotman and Queens both have MFIN programs. Otherwise I'm considering Ivey or Rotman MBA programs.

Any advice is appreciated.