I share all your concerns.
On another note, unless BP is poised to make it on the big screen within the next two years, I'd rather he stay on an Avengers team.
Like you posted previously, BP only needs a couple pages to show his fighting skills. I don't think it is too much to ask for.
I am worried about who the next writer will be for BP moving forward.