Mindstorms Software Versions Here is what I have:


Site licences for Mindstorms Software 1.0 (NXT) and EV3.
An upgrade to Version 2.0 for the NXT
9 NXT kits 
4 EV3 kits
2 Renewable Energy Kits and Temperature sensors


My problem is that on the NXT units, the only version of the software which supports the Renewable energy/temperature sensors is 2.1, which does not appear to be an upgrade to 2.0, but is instead a education site licence version like the ones I have for NXT 1.0 and EV3. Without these I cannot access the blocks to use the Renewable Energy kits and temperature sensors unless I use the EV3 kits.

My questions:


Am I right, or is there a way to upgrade 2.0 to 2.1 or 1.0 education to 2.1?
is there a way I just haven't been able to figure out to use these sensors with the 2.0 software?
Is it worth updating all my existing material for the NXT bricks to program them from the EV3 software as well and dealing with the small issues or not?


I have tried contacting distributors, and looking online has only helped me find the appropriate sensor blocks for the EV3 software.
You probably don't need it, but the LEGO Education NXT 2.1 Software is still for sale through LEGO Education (at least in the USA). They do not advertise and upgrade price, but it does not hurt to ask.
The Energy Meter blocks are available for download on the LEGO Education website. I went to http://education.lego.com/en-us/downloads and checked the box "Blocks" under "Download Type" and it shows up in the list. It does not say if it is for NXT or EV3 though. Also, I found this for the NXT Temperature sensor.
I would not recommend using the EV3 software for programming the NXTs. There are a number of limitations, such as lack of support for 3rd party sensors and lack of support for Bluetooth. Also, I understand the programs take up much more memory this way.