This is already a priority for us, but I can't promise a date yet. The Nightmare Mode system was originally built on the back of Hard Mode, which is why they share a lockout. It's a technical consequence of that fact, not a philosophical thing on our part.
Good, thanks for the update. This does need to be done. As someone above me said, 2.3 would be a great goal if possible.