Frens. I got an offer to TA this class that I really, really want to teach someday. It would be awesome to get some time in front of the unwashed undergrad masses practicing lectures, and the prof is excited about me.
One problem. My "major" or whatever is Computer Engineering. I didn't really want this, but they accepted me early and made a fat fellowship offer so I couldn't turn it down. This class is Computer Science. They want me to change majors, and potentially advisors.

Now, I'm totally okay with this. My lab is great, I love my advisor as a person, but the research is kind of lame. I'd rather be doing other stuff.
Is it worth the headache to switch going on year 3? I've passed quals and everything in the CE school, and I'd have to do some heavy lifting to get into CS, maybe take a pay cut, but it would be way more fun, and I'd probably have a better chance of a tenure track down the line.
I'm so torn. I don't want to be a dick to my advisor, but I would love to switch, even if it means some bonus years in school.

What would you guys do?