Can't you just spend a feat on Martial Study, get a Devoted Spirit maneuver, and at the same time get Diplomacy as a class skill?