This is just my opinion. Since you need a new grate anyway get a high performance grate. I bought a used, (used is as good as a new one), R&D Aquavane for under $50.00 on EBay. What a difference, I don't think it added to the top end, but it's much more manuaverable, 360's and stuff. Also the ski seems quicker out of the hole.
The downside is, it's probably more prone to picking up stuff.
Lou