1. Java and C++ are quite foundational, I think. I don't think it is a problem at all that you don't learn version control in school. Version control is quite simple conceptually and is a simple matter of memorizing the API/commands.

2. I'm familiar with the programs that you mentioned and the general hiring climate in SV/SF. Email me (listed in my profile) for a deeper discussion on your options.