Both Surge should to be semi-persistent like Rampage/Berserk, with the condition to get effect and increased effect as successful Weapon Skill hit. Also instead of absorbing Hp on auto-attack, Life Surge should solely absorb Hp on WS, somewhat like the old incarnation.