I didn't realise the contract with Amelie was only until Christmas marathon - to be reviewed again then I guess? I take your point about the mindset he needs going in to matches but think of Nadal who is always ultra 'humble' in relation to his opponents before a match, in a kind of reverse psychology I think. I'm rather glad that Andy isn't arrogant in the way he approaches opponents before a match but then I'm not a sportsperson like you.
With others thinking similar about her contract I must have read an incorrect report? Hey, that is the norm with tennis information especially about Andy M!
On mindset I am not saying that he has to become arrogant. I do not go around telling my opposition that they stand no chance if I am alongside them with a mile to go. Reputation does it for you. If they see you there they almost give up. Remember the Mo Farah races recently. The opposition were defeated in their minds before the races started.
Sadly Andy has got himself a rather negative reputation. He seems not to have so much belief in himself. As a consequence many think that they have a chance to beat him and do. A Rafa or a Roger have the benefit of winning reputations. As you say Rafa does it by an attitude that he is humble off court but so positive on court. Roger does it by making it quite clear he will win and will condescendingly praise if an opponent dares to do well or even win. Both, in my opinion win a lot of matches by their reputation complementing the skills. I prefer the Rafa approach I must admit.
The Andy approach is less certain of a match outcome. "It will be a tough match" or "he is a good player" is repeated frequently. Those only encourage the opposition as they see doubt in his mind. That is all. I want players coming to his matches expecting to lose! It makes it a lot easier to win.
That is enough. Many of you must think me a rather devious sportsman by now using mindgames to win the mental battle. The good feeling of winning is addictive and he needs to have that back.