PsyDapplicant2008 -
It certainly sounds like you've worked very hard to turn things around, and you've got some great experience. Still, it may be that your GPA is a tad low for competitive phd and psyd programs. Still, if your GREs and recommendations are strong, who knows? One option might be to apply to some master's level programs as well as doctoral programs. You might be someone who'd be even more competitive after getting your master's in clinical psych, especially since you seem to be on an upward trend!
best of luck to you!
psychmama