Is there a way to make short charge apply to the Charge skillset?
Yes, but you'd have to make Charge use actual "skill" slots.
Also, you'd have to a formula like PA*WP. And it probably wouldn't stop you from moving after executing, so it would have less drawbacks than before. Several strings attached, but yes you can.
You could shorten the CTs themselves.
Oh! I also noticed in the BMG that the undead archer's Charge works slightly differently in that it allows the unit to continue with Charge after the weapon has been broken. May want to give that set a try before you go out and make new skills.