I would say b18 swap just because of the displacement, but the z6 is a nice single cam! **** what ever is easier!