I'm a Jr. now in college just finished Descriptive Inorganic, Physical Chemistry I (quantun mehanics), quantitative analysys, and Physics III (wave mechanics/light/AC current).
I'd say Chemistry major is the only way to go, but we are all biased on these forums. I personally found quantun mechanics in Pchem I to be one of my favorite courses, as quantum physics rules and it's awesome to finally be able to understand Schrodingers equation and wave equations for electrons.
Inorganic is awesome, whereas in Organic there were rules which usually always worked, and mechanisms that one had to memorize, and only certain ways atoms could bond, Inorganic is a lot different. In Inorganic you learn that every rule has an exception (usually more than one) but I found I liked it because you realize how much chemistry there is in our everyday lives that is Inorganic. I still have to take advanced inorganic which is more metal complexes and bioinorganic and stuff, but I'm looking forward to it. I'd say Inorganic is easier than organic, but that is just my personal finding.
Quantitative analysys is the class prior to instrumental analysis, which I personally was not huge on. It's pretty much a lot of titrations, except being REALLY accurate and using your 5 sig figs from analytical balances this time around. We did get to make our own electrochemical electrodes and do an electric titration which was pretty cool. I'd say its a worthwhile class to have under your belt, but not as fun as orgo/inorgo and the theoretical stuff
Oh yeah, the reason I mentioned Physics III was because as an ACS approved option for my BS in Chemistry, I have to take up to Physics III, and in my school if you take one more class (modern physics) you get a Minor. So most chem majors I know pretty much are 1 or 2 classes away from a Physics Minor, and usually Math minor as well.
I'd say switch over if I were you. I think most companies would rather have a chemist then a biologist on their team.
Furthermore, Chemistry students get their pHds PAYED FOR, tuition waved and a 25-30k stipdent to help TA a class, whereas no other major gets that (not even biology).
Switch it up, you wont regret it, and you'll probably have an easier time finding a job/getting to grad school for free