Estoril may not be a proper choice,it's just ATP250. I think he should have a week off instead to focus on the higher tournaments.
Yeah, I think he should leave Estoril for Montanes
But seriously, he should focus on the bigger tournaments, maybe he can win another one. Maybe even a slam if he's lucky.