Is the Temple Mount a Replacement for Mount Sinai?

The poem may have gotten its final shape after the Israelites were settled in the land with their own king and temple. Some translations put the second half of this poem as future to avoid this kind of conclusion, but I think that they're wrong. The Hebrew really lends itself just very naturally to just keep reading everything in the past tense.