I started out as Computer Science and went into Computer Engineering, sounds like the opposite of you
I suck at circuits though, so my emphasis was software engineering.
I wouldn't say that folks with Computer Engineering degrees make all that much money
I'm an Embedded Software Engineer, and I envision that those with similar degrees to mine who work more strictly with hardware earn about $3000-$4000 more a year than I do, and the median for someone with 4-5 years of experience for a Software Engineer is $70,000.
I know that money isn't everything, you can do a lot with a little if you're careful (trust me I know), but... have you been to salary.com to look at what CAD folks make?
EDIT: Wow, looks like we have two EEs checking in thus far! Not easy programs by any means (hence why I went CpE instead of EE, I just wasn't smart enough!) Guess we can't all be Jeff Keachers, who has my utmost respect
Some people become doctors and some just become dentists