Re: Whats my best course of action?
Build 1075 of the trunk will work with WordPress 2.5 and matches the new password method. There is also talk of some kind of bbPress updated release around or with WP 2.5
Either way you are covered – just don’t modify core files (only templates and plugins) and you should be okay. You’ll only have to do a small edit to the config.php (bb-config.php) file when the time comes to match the secret key in WP to BB.