I wouldnt by a new crank. Have yours trued and welded and the better bearings put in. Port it, advance the timing to +4 and call it good. Your setup is pretty similar to mine and I am very happy with the power and performance. You also need to consider what kind of riding you do the most. Dunes, mx, drag ??