My two cents, having now extensively played PLD at 60~ I haven't gotten into Savage with it, yet, but...

Shield/Sword Oath are just fine. You need to get better at managing them if you're running into issues stance-dancing for certain skills. You can turn Shield Oath off without interrupting your combo to get unmitigated damage on your GB, for example, then turn it back on after a combo or so. I ran numbers on it - it turns out that switching on Sword Oath is ALREADY a dps GAIN by just staying in it for one combo. Just. One. Dropping Shield Oath (not even turning Sword on) is the same. The only change I would suggest is to decrease their recast timers. Make them GCD but with a shortened GCD like Chakra on MNK. Instead of base 2.5s, have it base 1.5s, scaling off Skill Speed. Would make stance dancing quicker and more fluid without removing that level of skill from a class that already has a very low skill ceiling.
// continued below because I have this annoying 1000 character limit