Do what excites you rather than something that gets you a job. If you really pursue something and apply yourself to that area, employers will bang on doors and windows for you. You would be surprised how many job postings will accept any of CS,EE,ME for the same job because it involves all 3 fields. BUT, if you really want to be a good asset, there is a rise in Mechatronic Engineers which are essentially jack of all trades (CS,ME,EE).
Link to a video to find out more about Mechatronics Engineering:
I for example I love Aerospace and even though I am currently studying very basic level of engineering EE/ME at a college, I already am working on laser guided missiles and I have interest from few companies like Thales and I will try to scrounge from them a paid Masters at Cambridge
If you really want to be as far away from Defence industry but still work in Aerospace, consider: ESA,NASA,RosCosmos. For them military application is the last thing on their agenda. Regardless of were you honestly will work, it will probably find a military application (Wheel is an important invention yet its found also on tanks). You will have to outweigh the ratio of 'How much good will an invention do for the world vs how much pain it will cause'. Every action has an equal and opposite reaction, we have missiles and we have Iron domes, we have viruses and antivirus, you can't expect a dog not to bark.