Considering there have been multiple soft-locks reported now, I feel the chance of fixing these outweigh the risks of breaking things more. As such I will be fixing the bug concerning the keep collision too. I will also -try- to fix the melee soldiers not fighting you. Though doing so might make these sections a lot harder.
The problem is, they keep trying to move even when you're body-blocking the path between them and their intended target. Since they only get one action per turn (Either move or attack) they waste their turn. The only fix for them that does not involve fully rewriting their code is giving them the ability to move and attack in the same turn. Which would make them a lot more dangerous.