I was in a similar situation when I was in school (graduated '05 from LSU).
I started in Comp Sci, and I quickly realized that computer science = database programming, desktop stuff, or web stuff... that's it. BORING!
I switched majors fast, my second semester. If your at all interested in embedded or working with hardware, don't go Comp Sci. I'm sure that there are exceptions, but the vast majority of guys I know with Comp Sci's degrees are either unemployed, or working from some large company programming backend server stuff.
At LSU, there was no difference in the curriculum between EE and CE until probably about the end of your junior year. Both took circuits, both took C programming, both took assembly, both took electronics design, etc. Guys that wanted to do power at that point took power classes electives, guys that wanted computer took computer eng classes, guys that wanted controls took that then.
I'll go ahead and let you in on something...something that most college professors won't tell you....most of your professors have no actual real-world experience. They got their PhD, then started teaching, so for the most part, they don't know what is used in industry, how products are designed, etc.
Once you know that dirty little secret, then you'll realize that they aren't supposed to teach you how to engineer a product...and they can't! They are just there to give you some building blocks, the rest is up to you.
If you want to do embedded type work, I'd say EE or CE... doesn't really matter IMHO. If you REALLY want to work in the power field, or you REALLY like analog, go EE and take the appropriate electives. As far was learning real applicable skills in college... don't worry about it. You'll learn those skills through your own experimentation, and on your first job (and every other job after that!)
I'm a CE, and I do everything from simple analog design, programming 8-bit to 32-bit, to iPhone and Android apps! With the exception of one or two "old-timers" that strictly do analog, everyone else at my work, regardless of if they are EE or CE pretty much does the same.
Aaron