down to warrior or engineer?
Totally subjective answer follows,
Go Engineer, I have a blast with mine and rarely if ever play my warriors. (all at 80 and geared)
Other opinions may differ. Your best bet is to make one of each and play them a bit for feel and then decide which to pursue if not both! Whatever the outcome I hope you have fun on your new character!
Go with the one you like the theme off. With the elite spec i suspect both will be in a good place in the expansion.
If you truly want versatility, engineer would be better. Even without the elite spec you can play with the toolkit for melee. And really, while the engineer has mostly ranged abilities, it’s a rather short-ranged class, with a lot of abilities and traits that encourage you to stay around the 450-ish range or closer.
Take my suggestion with a grain of salt, though, as I main an engineer and haven’t bothered leveling a warrior past 30 or so.