water/meth or not

hey all.....after my sudden introduction to engine failure caused by the water/meth failing on the dyno at WOT, I am considering losing the WM.
what I thought was to run a safe 6-8 psi tune for the street on 95 pump gas and then using C16 or similar race gas for the strip to 18psi ish.
would just have a separate fuel cell for race gas.
I just don't trust the water/meth no more.

opinions appreciated. cheers