I think in a traditional 4-man bench (AL) you'd want two infielders anyway. One backup catcher, one 4th OF, one utility IF who can adequately cover SS and then another all-purpose utility guy who can cover 2B/3B/LF; sometimes one of those spots will be given to good pinch hitters who can't play a lick of defense but I don't think that's as common anymore, specially since if they were a good enough hitter they'd be starting at DH or 1B. I kind of wish Pearce would be given some reps at 2B, he's an awful outfielder.
For what it's worth, Solarte has played shortstop in the majors before, in fact he started over 20 games there last year so it's no guarantee that Gift will be the de-facto SS backup assuming Diaz is the starter, which I'm not sure is necessarily what will happen. I can see Diaz and Solarte splitting time at short until Travis gets injured.