When the Scots get their independence that should solve the problem.
The term Britain and British Isles will revert to being purely geographical expressions, and noone will have any excuse for thinking the contain an implied divisive political meaning.