I actually was hoping him to give up at round 1

after the draw because it is too difficult. If he were at the other side, there might be a chance similar Wimbldon 2012.
He needs to do his best to save energy for 1 more grand slam. Just like CCP did not fight Japanese and did everything to grow (hide) strength for the right moment. He has proven himself. There is no need to show pride anymore. 1 more grand slam, that is it.