It took some persuading with a small screwdriver, maybe 5-6 minutes of work to get it free without damaging anything.
I am working on the primary too but it should be all back together by tonight (hopefully) for some testing.
The heater would be great but that's a purchase for another time when funds allow it (read: after christmas)