with newer bigger engines avaliable now i would get sell it asap on whatever i would get rather than waiting.
i have driven both b18c5 and h22 in same car , and found h22 much more powerful than b18c5, those figures and graphs on prevoius page are not accurate measure
what cc injectors are you using ?