Riley leaving was totally expected. Everyone was surprised he stuck around after season 4 ended. He was too good. That was the point, his relative normie-ness and puppydog love contrasted Buffy's insecurities and jaded nature. She could never have Riley. His role is that tragedy.