As a junior with an aptitude for computer science, you should take as many CS courses as you can handle. Lots of employment opportunities for those with CS knowledge as well as data analytics.
Criminal Justice is an easy major. Good for those who want to pursue a career in law enforcement, but not so good for preparation for law school which requires strong analytical reasoning & writing skills.