While I fully sympathize with your situation I'm not sure I would like to see this fixed by way of completely ignoring retreat on assassination attempt.
It may happen that for equipped mages I'll prefer to sea them die while retreating rather than risk the assassin get their items. I think the retreat command should be more specific, always retreat and retreat except when defending life (vs. an assassination attempt
)