why swap into a b16. if i was going to do a swap i would just do a b18, but hey i'm not an engine expert either just if your going through the hassle why not add 15hp or so?