Your waveforms seem to indicate that you might benefit from adjusting the trimmer capacitor on your probe(s).