For a MFE or Ph.D. you will ultimately need to have a good grounding in math/comp sci. Most MFE programs will require calc1-3, linear algebra, and differential equations to start. In addition, some
c++ programming (2 courses). Those are just the basic guidelines. In the job market, you will want to know some other languages such as
python, sql, and vba. It is more competitive today than it was in 2006. On the other hand, Ph.D. programs in Finance are ultra competitive requiring high GMAT scores. To give you a better idea of whether or not to major in quantitative finance, study for and take the gre or gmat. If you're scoring in the 95th percentile or better in the quantitative portion, you'll likely have a good chance at a MFE or Ph.D. program. Manhattan GRE/GMAT provides some good books for studying. It should take you two to four months to complete the series. Good luck!
As far as my recommendation goes, if you're worried that you might not do a MFE/Ph.D. then major in computer science. But if you're deadset on becoming a quant, major in quantitative finance as the exposure will likely serve you well in graduate studies.