Metzudah means a fortress, so the pasuk in Shmuel would refer to the “fortress of [around] Zion.” That would still fit with Zion being Har Habayis or Har Hazaysim.
My guess is that the reference to Zion in R’tzey is Har Habayit because the bracha is about the temple service, which can’t be done anywhere else.