Computer engineering, which is a mix of software and electrical engineering is going to be heavily in demand for a long time. Hardware design and the constraints it puts on software are processes for which the set of design tools are very poor. The traditional engineering disciplines are all the same, EE, ME, CE, etc. and to be honest I don’t use anything from my ME degree in my job. If I had to do it again I would go computer engineering.