As you say, the chances of EH making anything other than a monumental pigs ear of it all are, slim...
I called in at Stonehenge on my way to Glastonbury last year... the first time I'd visited for about 11 years and the days of the 'exclusion zone'. The place just filled me with sadness and I didn't stay long.... just gazed through the fence for a short while.