PH2 direct mounted vibration clipping issue/question

UPDATE
I have now replaced the folding Props with new T-Motor Carbon 15x5 - no improvement at all.
Then I have mounted the PH2.1 with Gel Cubes 15x5x5mm on the frame and flew a small auto mission. There is an improvement but it is still not ok. So I did a new autotune with the gel cubes and flew the same auto mission.
REMARK: Flight 1 was another day with a lot of wind and the auto mission was a little bigger:
Overview - logs can be downloaded, just click on the link below.
02.09. Flight 1: Log 26: direct mount, windy day, old PIDs
22.09. Flight 2: Log 27: Gel Cubes, no wind, old PIDs
22.09. Flight 3: Log 29: Gel Cubes, no wind, new PIDs

Please note: all autotunes were done with ATC_RAT_RLL_FILT, ATC_RAT_PIT_FILT = 10 hz and AUTOTUNE_AGGR = not changed

Flight 1 FFT:


Flight 1 vibes:

Flight 2 FFT:


Flight 2 vibes:

Flight 3 FFT:


Flight 3 vibes:

So my conclusion are:
Vibration damping with gel cubes does improve the vibrations.
Not optimal PID values can cause Z-Axis vibes.
Of course wind has a big influence - but for the FFT analysis this should not matter.
The self resonance frequency is not affected by the gel cubes but the amplitude gets lower - so the gel cube are a good damping method.

So what do you think about my issue? Should I just go for another frame or go back to the PH 1 or the good old AUAV-X1 which runs great on an old tarot 650 Iron Man frame?
Or should I just try another vibration damping method?

BR,
Lorenz