If you want to go for a FE/MF degree later on, then CS + Math + bunch of relevant econ classes (minor, maybe?) is ideal.
In an econ major you will definitely take classes which may or may not be relevant to your FE pursuits.
Some Econ classes that may be relevant to Quant Finance field /FE are:
Intermediate Micro
Game Theory (Almost every Trading interview I've had has asked me NE questions. It is also a part of curriculum in the prop shops training for Trader position)
Econometrics
Derivatives
Fixed Income (could be considered business school finance)
FWIW,, my background Math+Econ+bunch of programming classes