An easy solution for the gen dying during crucial moments is to get him killed prior to the melee itself. The suicidal peasant gen is a wonderful tool for a skirmish you know.