Aspiring Quant, Majors and Universities

Hello!

Im a junior in high school pursuing an IB diploma. I take the following high level subjects: Math, Physics, and Economics. I take the following at the standard level: French, English, and Computer Science. In the future I would like to work as a quant, and after searching I have found varying answers. I intend to double major to broaden my horizons, however I am not sure what to pursue. I am certain that I would like to take Computer Science as one, however the second slot is still open. Some people have said finance, others have said physics or math. What works best, and what schools would help me stand out to employers (considering I am pushing between a 38 and a 40 predicted). 

Thanks :)