After BoBW, Picard should have been put on the beach for awhile. The episode Family reinforces this opinion for me. The guy had some issues and needed to sit out the game and get his head back together. At least, Starfleet shoud have put him in an administrative post somewhere - commandant of the Academy, perhaps.
With that out of the way, you promote Riker to Captain, and Enterprise continues along it's merry way.