I honestly don't know why you say he has more to his game, his long distance shooting is completely gone, just look at how many shots he takes and the poor percentage of actually converting them, lets not even mention his inability to beat players now, or his freekicks. He basically lives inside the area looking for the final pass imo. Dude has decline too much to even be compared to Messi, hell its an insult tbh
From the top of my head, he has like 5 or 6 goals from outside the box this season (this includes 2 free kicks) & has the most assists for RMA in all competitions. Yes, he thrives from the service of his teammates more than ever but that is natural as no one can be beat father time.