I think the swap would be the best bang for you buck if you plan on modding your car. I am hoping to have one in my car in a few weeks. I am upgrading from an H23 to H22 though. It still should be an upgrade.
Good luck