Criminal Justice is a safe choice. However, it would help you stand out by having a minor in psychology, sociology, or even anthropology. I will caution you though, with a criminal justice major, you can be stuck in law enforcement. If you decide that you do not want to work in law enforcement anymore, or if you retire, you may find yourself wishing you had a more broad college major.
I hope you may still find my answer relevant as it looks like you posted this a while ago. I do agree with Daniel above, however I would like to note that there are many types of law enforcement positions. You could work as a police officer, ICE, Correctional officer, ect. Once in the position, other opportunities could open up. I would also recommend to talk to your local law enforcement department and see if they could give you more detailed advice on what to study for a particular position and what advancement opportunities that position may have.