All right, gave it some thought and have made some considerable changes (as well as clarifications) to Templar:
Astra: Changed to level 30. Placed on GCD. Timers adjusted slightly, added MP Cost.
Discipline: Changed to level 35. Turned into the tanking stance. Reduced damage mitigation and Parrying Rate for 100% uptime, added Parrying Strength and enmity increases.
Faith: Changed to level 40. Removed Regen. Increased recast time to 180s.
Lifebreaker: Changed to level 45. Removed damage dealt added a Regen effect.
Bonecrusher: Changed to level 50 and from a weaponskill to a mitigation buff. This is the Templar's panic button so to speak. For 15s it counters the damage from auto-attacks and adds an 80% Parrying Rate increase which bumps them to 100% Parrying Rate under Discipline. Their Parrying Strength will also be bumped up to a flat 65%. With this they will only suffer 25% damage of the target's special attacks (weaponskills, abilities, magic etc.) under Discipline. Since it's not as powerful as Hallowed Ground I made it have a recast of 5min.
All "Thrust" abilities: Will have increased enmity. This will facilitate a 3 step combo for maintaining enmity and give minor enmity increase for offtanking with the lower DPS combo.
Reinstated positional requirements for other weaponskills sans Heavy Thrust.
Ring of Thorns: Added a Combo Bonus: Add.Effect: Increased enmity.
Piercing Talon: Specified the enmity increase.
With these changes in mind I gave Berserker another look with a fresh mind and decided on some changes for it as well:
Berserk: Changed name to Instinct. Derped on MRD having Berserk already. Greased Lightning (per stack): Increased damage mitigation from 5% to 8%, decreased evasion bonus from 7% to 5%. Attacks that change form to Coeurl will also give an enmity boost.
Mad Rush: Changed to level 35. Placed on GCD. Potency reduced to 110. This is the Berserker's pull.
Scream: Changed to level 40. Changed to Howl. Increases own maximum HP by 20% and nearby party members' HP by 5% for 45s. Recast of 240s. Forgot PGL had access to a GCD AoE Silence as well as a 40s stun. I'm thinking about changing the stun to GCD for Berserker but still undecided.
Eject: Changed to level 45. Recast reduced from 60s to 50s.
Hone Senses: Changed to Inner Calm. Removed critical hit rate buff and added an 80% evasion and critical evasion buff. Berserker needed a panic button of sorts. This allows them, with 3 GL stacks, to have a 95% evasion. Since there is still the chance of being struck by a hit I made the duration be longer with a 300s recast. Featherfoot cannot be used while this buff is active and this buff will overwrite it.
Given access to: Marauder's Berserk since it no longer stems from MRD.