Either swap would be easy, the h22 will net more power all the way around, depends on what you wanna spend and your power goals. The H22 will require a lot more work, Such as shifter linkage being that its cable operated and you will need aftermarket mounts, The b16 drops right in with stock b-series mounts and wiring on both is really easy. I seriously would reconsider sticking with an automatic though...