Ricky truely does know his stuff and has mapped a couple of b16b turbos previously.
That said for your power goal and piece of mind, I would probably either sell the b16b, and get a b16a. Or sell your b16b block, keep your head and get a b16a bottom end.
Look into piecing together a kit of...