Ok, let's do this really slow.
Almond+, Add Sensor, remove. Not Remove all.
Thermostat, remove from Z-Wave gateway.
You should see a message on the Almond+ LCD that an unknown sensor has been removed.
Now the thermostat should be ready to be added again.