Sadly yes, for the moment you are stuck with the firmware. Without going into too many technical details, the DEMO units are identified by a flag (just like a retail, or a TEST etc), so it will not allow you to install the Retail FW on it.
Basically, you are stuck waiting for an updated firmware.