Yeah I'd agree that the quality isn't quite there yet.
For me, I'd prefer a more defensive minded foil for Herrera, albeit a player who is comfortable on the ball - such as Saul. Verratti would be the best out there in my view, there's talk of him potentially leaving PSG this summer. In terms of more attacking options for the role, would you consider Fabregas were he to become available?
With a more defensive minded foil, it would free up Pogba yet more. I also expect us to improve our attacking options this summer *cough Griezmann. With that coupled with the expectation that Martial and Rashford will deliver more next season, I think we'll be fine for goals.