I always liked tuning what I have in hard parts. That way you have a known reference, and can reuse the good known parts. ( I would call virgin W2 castings, " good parts"...). A improvement, probably could be done on the M.P cam. If you like the cam, run it,) You have a lot left in that combination, I.M.O.. Maybe others will chime in with W2 combo's , or start a thread in small block tech forum .A good valve guide/ seat centering, would work wonders for starts.