I agree in that Diadem was probably mean't to be something similar to this, but alas we know how that worked out.
Honestly if Diadem was perhaps an area you could just fly to instead of waiting hrs to enter it may be viable? Not exactly what was suggested but it would be something i guess