I think it would really be best to first have a completely EE sourced version.
The problem is that much of the EE source lacks luminance detail, which is detail that is preserved in the theatrical blu-ray. So despite other problems with the theatrical blu-ray, they are lesser problems than the lack of highlight detail in the EE blu-ray, IMO.
There’s probably better high-luminance detail in the new 4K blu-ray, though.