Seeing all the work thats been done, I would say keep the 16v for sure. If you are chasing some more high rpm power, spend your money on camshafts and cam gears. The main difference the blacktop would give you is higher compression ratio. And the 20v requires more custom parts, which can be good or bad depends who makes them.