BuddyPress.org

@mercime

Thanks. I opted for option 2. For the benefit of others, here’s what I did.

(This was a new install)

Deactivated and deleted BP and BP compatibility opting to remove files.
Removed BP folders from child theme and header-bubbypress.php and sidebar-buddypress.php. Thus making a clean start.

Installed new BP beta.

Theme worked perfectly without any tweaking. So far no issues.

Many thanks.