My advice is to follow the Mechanical (or the Electrical if you're inclined that way) engineering path. You can decide on a career when you graduate. There are places for Mechanical and Electrical engineers in all industries - including aviation. The long term prospects for an Aerospace graduate would be more limited.