Econ with 3.7 or Econ and Math with 3.5 for MSF and jobs

I'm a junior studying Econ and Math at a top 25 college (think Berkeley, UCLA, USC). I had prop trading research and fund management internships for the past 2 summers. My goal is to work in Investment management, Asset Management, research, risk, corporate finance or portfolio management. After I graduate, I hope I can work in one of these industries for a few years and then get a MBA. If I can't find a decent job, I will apply for MSF such as Villanova, WashU, UVA(Commerce degree), LSE, and so on. I'm not really into quant so I figured MFE is not for me. However, as I'm doing more and more high level math classes, they are beginning to hurt my GPA. Given my goals, should I keep my major as Econ/Math? Do MSF require a lot of math? If I do keep my current major, I will have a lot of struggles keeping my current GPA, which is around 3.5. Or I could major in Econ and get a minor in Mathematical Finance so that I don't have to take high level math classes. Instead I can take business probability and business stats, which I suppose would be a lot easier. By this hopefully, I can boost my GPA up to a 3.7 3.8 till the time I graduate, which would give me a better chance at getting jobs and getting into grad school? Any input would be appreciated! Thank you!