System Clock Ringing
The probe is connected directly at the pin of the oscillator. I soldered a small wire onto the ground pad and I connect the ground clip there. This is VERY near where I'm probing.


No. No. NO! If you are using a long ground clip (and even connect it to a wire?), it does not matter how close the point is, you still add a huge amount of inductance. To be sure, use something like this:



This also could be a probe compensation fault. Be sure to check that.



Image sources:
1
2