Catcher is actually one of the places we need the least amount of help
Vasquez is just fine. He takes good at-bats, seems capable of being a consistent .270 sort of hitter - and given his defense that is terrific. The power is limited, and offense will never be why you pay him ... but I am comfortable that he is a long term starter for any number of teams, including this one.
We could possibly upgrade at backup catcher - but again, for a backup, Leon is about as good as you will probably get. Now in 2018 maybe try to get it to more like 120 starts for Vasquez and it'll be okay.