I bit the bullet and replaced the stock VW rocker shafts with CB Performance bolt together shafts. It took some fiddling with the spacers to get the proper clearances.