Your pics are down.

As for swapping, pretty much any b-series is the same amount of work. If you're fine with doing a b16a swap, I'd also consider a b18b (if you want to turbo down the road), a b20 (these are really cheap) or a b18c if you've got a little more money. Really, you can't go wrong.