I don't think so.
AO 2017 wasn't even that high of a level despite what OP claims, he managed to win but his level of play was very average, a miracle how he scrapped through.
He then had some average tournaments, and some shocking losses like Coric one, which all signaled further that he may be on a big decline.
But he actually played great tennis in Wimbledon, his forehand was on fire in most matches, some people here even almost compared it to 2006 fed, which is obviously an exaggeration.
Then he played vs Anderson on court 1 which is higher bouncing and faster (both which suit anderson by far) and which hurts federer's slice and federer's slice serve, specially against bigger guys, and yet he was 2 sets up with matchpoint.
I think he will be fine.
He can compete for AO for a couple more years, maybe have an ousiders chance at USO for a couple years, and he will be one of the favorites at Wimbledon for at least the next 3-4 years.