My guess is it will ship with 3.0 with the merged codebase since the merged codebase will be philisophically a new beginning. To get an idea of what it might look like, visit http://testbp.org.

By releasing Buddymatic I demonstrated that a theme could be BuddyPress capable without being BuddyPress dependent. I think it would be appropriate if the new default theme had that capability.