I am somewhat confused by your GPA numbers and statements. Since getting your act together and moving schools, how has your grade breakdown been per semester (A's, B's, C's)? I'm not very qualified to comment on grade remediation sufficiency, but this will help the more knowledgeable to assess if your performance is satisfactorily improved. My unqualified opinion is to graduate and consider a masters or post-bacc (remember, this is not a race to the finish--which is something I suspect you can appreciate).
As far as EC's go, what distinguishes a mediocre from a phenomenal experience is not the amount of hours invested but what you get out of it (mainly in terms of personal growth and development). In research, that means productivity in the form of presentations and publications (in addition to honing skills). In clinical environments, this means developing a strong understanding of the state of healthcare, whether it is what you truly want, and hopefully obtaining some genuine empathetic and moving interactions that you can convey in your application. Do what you find the most value and interest in first and foremost, but I would suggest obtaining hours shadowing a variety of physicians.
Most importantly, kill your MCAT. It can help alleviate a lot of the GPA issues you may face, especially combined with your improvement trend. This is your proving ground and you only have one good shot at impressing.