I think auto-guard could be implemented like steadfast and activate while you stand still. Self preservation could still boost duration of shield skills and they could even make a trait like Enduring march for it.