good for you! too quick. i was just looking it up to find the detail, and you already answered!
correct on both counts.
the whole drama plays out in 1 Chr 21, the plague is stopped at the threshing floor of Ornan the Jebusite.
David chooses this as the site for the temple:
1Ch_21:22 Then David said to Ornan, Give me the place of this threshing-floor, so that I may build an altar in it to Jehovah. You shall give it to me for the full price, so that the plague may be stayed from the people.
Solomon builds the temple:
2Ch_3:1 And Solomon began to build the house of Jehovah at Jerusalem in Mount Moriah, where He appeared to David his father, in the place that David had prepared in the threshing-floor of Ornan the Jebusite.
And of course, Mount Moriah is the very place where Abraham went to sacrifice his son Isaac.