If you want something that is less work than swapping an H22, you could do a B20, boost it, and then do a B16 or B18C1 head swap down the road.