Yes, and considering the volume of quality wrs in this draft, we're looking to replace BOTH Diggs and Davis. Samuel is a nice signing but he's more a high end WR3. Shakir being a high end WR4.
And personally I'm tired of worrying about whether Stef's head is in the game anymore. His playoff drop-off these last 2 years speaks volumes.