The heater pipe can just be pulled out (the barb won’t survive). You can get another press in barb, or tap it for a brass one.
I’ll let others comment on the thermostat. But if it was running fine, why change from a $5 stat to something hard to find and expensive? You have to get the restricted plate too.