In spite of the HMF description, you can see from the photos of Whisky Mac that it does grow in small clusters and it does have more than 30 petals. Here's a photo showing both of these tendencies:
http://www.helpmefind.com/rose...
Brandy, on the other hand, is a classic hybrid tea and doesn't produce blooms in clusters, contrary to the information on HMF.
I'm not arguing in favor of either ID. I just want to point out that the HMF descriptions are often contradictory and sometimes false.
I don't think we have enough information to attempt a definitive identification. There's still a chance that this rose could turn out to be a floribunda or a shrub, and given the popularity of apricot-blend roses, there could be dozens or hundreds of possibilities.