I wouldn't necessarily want to "fix" BoBW2, but what comes after - because, I think, the correct building blocks are there, they are just lacking lasting consequences... We have:
The one piece that I would have added to that mix is: severely damaging the Enterprise, for example destroying the saucer section while barely surviving on the battle section (or vice versa).
To the viewer, the Enterprise is sort of an icon for the state of Starfleet, the Federation, the individual characters - so what better way to show how affected these are than to show the icon itself on the brink of destruction.
I would then have followed BoBW2 by not only a single episode dealing with the fallout, but a whole arc of perhaps four to six episodes dealing with the theme of "Rebuilding": Most of all deal with what happened to Picard and "rebuild" him from the physical and psychological rape he's gone through - all the while also rebuilding Starfleet and the Enterprise itself.
At the end of that arc, which might span well over a year, we would see a brand-new Enterprise being sent on its first mission under the command of Captain Riker, with Picard on board as a civilian advisor or diplomat, after having resigned from Starfleet. The mission would be one of "exploring the unknown" - instead of "going where everyone else has gone before", like the last three years after the failed Farpoint mission.
- A starfleet captain that was forced to attack and kill his own people
- A senior staff (and especially XO) of a starship that was willing to kill his own captain for the greater good
- The whole Starfleet in shambles
- Enough characters available to do some shuffling of the chain of command
The one piece that I would have added to that mix is: severely damaging the Enterprise, for example destroying the saucer section while barely surviving on the battle section (or vice versa).
To the viewer, the Enterprise is sort of an icon for the state of Starfleet, the Federation, the individual characters - so what better way to show how affected these are than to show the icon itself on the brink of destruction.

I would then have followed BoBW2 by not only a single episode dealing with the fallout, but a whole arc of perhaps four to six episodes dealing with the theme of "Rebuilding": Most of all deal with what happened to Picard and "rebuild" him from the physical and psychological rape he's gone through - all the while also rebuilding Starfleet and the Enterprise itself.
At the end of that arc, which might span well over a year, we would see a brand-new Enterprise being sent on its first mission under the command of Captain Riker, with Picard on board as a civilian advisor or diplomat, after having resigned from Starfleet. The mission would be one of "exploring the unknown" - instead of "going where everyone else has gone before", like the last three years after the failed Farpoint mission.
