Hello Andy, I remember you.
Your question is one which caused me problems many years ago when I was still at school and trying to decide which college/university to go to.
I ended up on an Electrical Engineering course, but that course covered as much electronics (light current) as it did electrical (heavy current and power).
My best suggestion would be that you get a copy of the sylabus for each course.
Read them and if you have questions, go along to the college and ask if you could speak to someone in the electrical engineering department who could give you some advice and maybe explain which course would be best for you.
If I understand correctly, the Electronics Engineer does more of what I am after, and the Electrical Engineer does more theory and would be more of a desk job, typically.
Not necessarily. IMHO.
A few definitions
Engineer: Someone who has had a lot of college, sits at a desk all day, designing stuff, pushing a lot of paper around. Gets into the workshop or out to the worksite now and again and tells the technician what to do.
Technician: Someone who had a reasonable amount of college and who does what the engineer tells him to do. Most of the time.
He may not have the knowledge to design the stuff, but he knows in detail how it works and how to fix it.
He does the practical stuff in all weathers and does not sit in an nice air conditioned office, bored out of his mind.
Manager: Someone who no one knows his background, sits in an air conditioned office all day looking busy pushing paper around.
Moans to the engineers and technicians that it is taking too long, costing too much money, and has little concept of what the practical difficuties are.
There are of course variations and exceptions to each of these job titles!
JimB