Computer science and programming is always a safe bet. And once this hideous financial catastrophe is over with... you'll come out on top if you have the innovative skills. You will be competing against the global market.
I kind of wish I was pushed into the field as a teenager. I grew up in the 1980's with always with computer or a variation of one in the house. But I was intimidated with learning the languages of programming.
It already looks like you have gotten a great jump start into the world of computing. And aren't there more then programming paths for you to travel down? Networking? Security? Web design? Just casting a few leads out there. Question you professors a lot! Ask for career advice and where you should focus yourself.
I can't really say if UC Berkeley is any good or not because that's an area I have no idea about.
I say stick with the path and you'll be going places.