Riker had his moments but I do agree with the concensus that had he left after BoBW it would have been better.
After saving Earth, the centre of the Federation and Starfleet, gaining lots of recognition and presteige, he then takes a step back to being just a First Officer--it made no sense for the character. He should have taken a command of his own and been replaced with Shelby, she would have helped add a new look to the crew.
Riker could then pop up a few times throughout the remaining series whenever needed.
Who would seduce the chick of the week then Geordi?