I don't like the idea of moving Barrero around either. I'd play him at SS, teach Farmer how to play LF when Winker sits (surely he can play it as well as Winker), platoon Friedl and Senzel in CF (hopefully, in the process, saving Senzel's fragility a little), and platoon Naquin and some X to be acquired in right. If that guy in right can also play some infield, it's ideal as to roster space. There are three guys who can go from infield to outfield and vice versa without budging Barrero off SS.