I'm all for seeing what you suggest though. I think it's easy enough to turn Swager's gimmick into a tweener gimmick or even a full on face (notice how easy Colter got the crowd chanting 'USA!' recently). So I wouldn't be surprised to see Swagger moved down to the mid card scene. Matches between him and Cesaro, him vs Barrett would be great to see too.
As long as he isn't completely jobbed out and fades away to obscurity, I'm happy.