bbPress.org

Just to follow up, what I did was use ssh to export my bbpress users from the db, and my wp users from the db, merge the 2, and bring them back into the wp db. Then turned on integration, and it works.

This took a long time and was a little hairy, but it works nicely now.