Could someone take on the task of sorting out Heaven and Mount Olympus?
They are, as far as I can tell, interchangeable but this needs to be confirmed. If it is confirmed, we need to resolve all of the texts and events to reflect the change.
The problem is illustrated by going to Pausanias Desc 1.29.11 and clicking on Heaven, look at the citations that come up: all Pausanius. However, there are events associated with it that take place in heaven, but there's no mark up for, say, Apol. 1.6.3 that distinguishes heaven.