Berkeley CS absolutely.
Stanford EE has terrible PhD qualification exam. Even if you are in the PhD track, if you don't pass the qual, you will be thrown out with only a master degree. In addition, since Stanford EE admits so much people, it is very hard to find a research advisor.
I have already been admitted to Stanford EE PhD track without financial aid. As there is no possibility for me to get financial support, so I have to give up Stanford EE.
Please feel free to contact me. Email: jun9zhao [AT] gmail.com