I think I'd be happy with the new Wraithknight but only at about +100 points. Other than that, as you say, keep the heavy weapons on jetbikes to 1 in 3 and keep the other Distort weapons with the old...