Its IS fine as it is. Did you know, that wpfs decrease recovery time a lot?
Just stop using 18+str/rest agi builds.
Just try this build which is for mostly couching instead of mostly thrusting:
Level 30 (4 420 577 xp)
Strength: 10
Agility: 27
Hit points: 45
Unused skill points: 6
Converted: 4
Ironflesh: 0
Power Strike: 3
Shield: 0
Athletics: 0
Riding: 9
Horse Archery: 0
Power Draw: 0
Power Throw: 0
Weapon Master: 9
One Handed: 1
Two Handed: 1
Polearm: 181
Archery: 1
Crossbow: 1
Throwing: 1
And still 6 unused skill points, your choice if you will get a shield or iron flesh or even athletics. Important is one thing: with shield you will thrust with lances much slower, but with couching you will still do good.
Meant to be used with Great lance to couch and any lance to thrust.