I agree that Shalit is a POW. But the "surrender to terror" comes in who is being released by Israel--the worst of the imprisoned terrorists. It is a swap of one POW for many Palestinian prisoners, some of whom are bloody mass murderers.
Interior Minister Shalom: I will act to revoke terrorists' citizenship, residency status (Haaretz)
from the article: Analysis / Israel and Hamas both trying to sweeten Shalit deal