Veteran catcher Yan Gomes has agreed to a two-year, $10 million deal to return to the World Series champion Washington Nationals, a source told ESPN's Jeff Passan on Wednesday.