I don't think we can count on Olave. I think he is done as far being a healthy effective player. If not concussion, then it seems likely he suffers another injury.
Shaheed to me is a nice number 3, his career catch percentage isn't good for a number 2 WR.