I still think they really jumped the gun on changing out the WCV, of all things. I mean, that's way down the diagnostic tree in my opinion. The thermostat, sure, but only after checking the water pump and radiator. You didn't mention any diagnostics on the water pump...the heart of the system.
Even worse is that you forked out that much money to have them not only incorrectly diagnose the problem, but perform unnecessary work. To me, that's a poor shop.
You need to at least get a 2nd opinion from another shop. In doing so, I would initially refrain from telling the new shop what work was recently performed (I'd tell them about the thermostat, but that'd be about it)...the gamble is that if you say "my last shop said I needed a new head gasket", then they'll be inclined to agree. Just tell them the symptoms, what's been checked (believe me, they'll still check) and have them draw their own conclusions.
You really need to check the LC chapter of the FSM if you haven't already.
http://www.nicoclub.com/FSM/Pathfinder/ ... der/lc.pdf