Apart from fixing the known issue that doesn't allow the quest to end, I would suggest to make it possible to continue the task even if the troops get captured.
When I was playing ,after losing the battle, 2 of the troops were dead and the remaining 8 captured. At that point the quest ended as...