If you're not applying this cycle, I would go for a retake but that's just me. In your situation, a slightly above average GPA would go along very well with a well-above average DAT, somewhere in the 22-23 range.
GC, PAT, and QR should be easy to boost in my honest opinion. Again this is just me. I haven't taken the DAT yet, but now that I think about it, if I had gotten a score like yours, I would probably ask the same question due to a lack of motivation to re-study again.