[Edi]

The best fix would be if shapechanging units always reverted back to the shape they had before battle, but I have no idea how feasible that is. It'd require a variable where the current shape is stored and that variable retrieved if the unit survives the battle. No idea if such things are already in game, because it would be different from firstshape mechanics.