A lot of that does look very similar to the degree I did (it was a Electronic and Embedded Systems and Engineering so had a little more focus on the digital). In fact the only huge difference was more "electronics" work and little less pure maths (but more physics and chemistry).

I guess my degree was pushing into the CS arena and CE is pushing the other way.

The first of your link looks like a perfect course for me :D