Actually things are not looking bad for you for MD.
A 3.6 is decent, especially with an upward trend. I know many people who have gotten in with a similar GPA and 30-32 MCAT. To maximize your chances, I would aim for a 33 or 34 but it all depends on how well you do on practice tests. If you get below a 30, you will be less competitive for MD but very competitive for top DO schools.
The most important part of your ECs to work on is clinical experience. Can you turn the two-month opportunity this summer into an ongoing clinical experience? This would help. Your research looks great, and the non-clinical community service is excellent, especially for service-oriented schools. You've got shadowing and leadership, which are important. Focus now on getting some good clinical exposure so that you know what it's like to deal with patients, and can explain that to an interviewer. Also, if you have any really time-consuming hobbies outside of what you've listed, I would include them on your occupation.
It's really hard to say which schools to consider without an MCAT. If you get a 30+ I'd say you are competitive for some low-tier MD schools but would advise you to apply DO as well (if and ONLY if you would be happy attending a DO school if you weren't accepted to an MD program). With a 33+, your great ECs, and an upward grade trend with explanation, I think you may have a chance at mid-tiers as well. Sometimes you don't know what an adcom is looking for, which is why it's best to apply to a wide range of schools...a few reaches based on stats and a lot of schools with averages at or below your stats.
Update us when you've got your MCAT score back and we'll be better able to advise you.