I'm taking the MCAT this spring. I know the preparation books I have through Kaplan have already added sections that are prepping you for the social sciences that will be in 2015. I bought those books last winter, so anything you find nowadays should include the new stuff you need to know.
O-Chem, yeah, you're not gonna be able to teach yourself all of it in time for the test. Not saying you cant do that, it's exactly how I learned orgo actually. Never went to lecture, just read the book and did problems. However, it takes a LONG freaking time to do that, so it's best to just do it as a scheduled class. I'd recommend taking at least physics 1 first, but you can teach most of physics 2 to yourself relatively easy. I had a friend do it over the summer and he didn't have too much trouble.
I'm glad I'll have enough time in 2014 to take it a couple times if need be, but I wouldn't stress too much going into 2015 if that's when you take it.