Yes the no tune CP3 kit will be fine as it's just a stock CP3.
Printable View
I agree the only proper fix is a CP3 conversion, but I doubt they are going to do it, but I am waiting to see, and I won't be holding my breath.
If they extend my warranty, I will go with my original plan and do the CP3 swap sometime in the next six months.
I've seen something with a more OK mesh screen that I believe is designed to stop metal contaminants, and if that comes out, I might consider it.
I don't think I will waste time with an expensive disaster kit if one is produced and spend a little more on the CP3.