Been playing Pathfinder Society for little over a year now, and after a weekend at Pacificon, I was feeling the same. I played a Ranger for the first time, instead of my usual Cleric, and I, too, felt more like a Mercenary. There was only one situation where we actually used Diplomacy to get out of fighting.