Computer Engineerinig is an excellent choice. You study a pretty broad range of topics (from analog circuits to software development management), so you can find out what exactly you like doing and focus on that.
The downside to this breadth is that you have to do extra stuff on the side to really get the practical side of this, so relevant extra curricular activities (robo cup, solar car, etc) and internships are more important. I think other more traditional engineering disciplines do a better job of preparing you for a job, whereas computer engineering will give you a good foundation, but not too much in practical terms.