Speaking as an Eagle Scout, former Scoutmaster, and (I think) still current merit badge instructor: The BSA as it currently stands should probably just go away. I think the best solution would for them to merge with the Girl Scouts, which is generally a much more positive and inclusive organization.