You k now your first rose almost reminds me of Kaleidoscope, but I've never grown Kaleidoscope, and it is classified as a shrub rose. Actually there are two listed on helpmefind. One is listed as a shrub rose, and one is listed as a floribunda. They both look like the same rose to me, but they are not reported to get as tall as you say your rose gets.
Alan