Yeah I’d do CS + Math, or CS + Math minor if you can, but just CS is fine too. Also do your best to try to get data science or analyst related internships. You can definitely get a data analyst role with just a bachelors but it will be difficult (not impossible) to get a DS role without some related internship experience or a masters.