Idk what your budget is right now, but JE forged pistons would nearly eliminate the chance of getting a chipped piston, which is very common in top swaps.