We're in the same situation. We had a blanket waiver until we re-registered the aircraft in February of this year and now they will not re-issue the blanket waiver for the same aircraft under a new registration. Seems that there is no way round it at the moment and going through American courts over a matter of their 'Homeland Security' is a non starter I would think.
The drawbridge has been pulled up again...