I know thats what you want and his finishing is terrible right now, but i'm not convinced it can not come back to his normal level.
Lets not forget CR7, in his last 3 seasons with Real was shit for like half the season before getting back to form. Not saying Messi is going to do that but its way...