#2 option makes most sense. He was overrated. His failures due to lack of complete game were blamed on mentality. He probably wants to believe it as well.
I'm not seeing any development in his game. But I could also say similar about much touted Zverev. Still FH can be easily broken down. Still not making best use of his serve.
