Should I pursue a good advisor-match or institutional prestige / pedigree?
There are some undefined terms here, so it is hard to give a definite answer: mediocre, for example. But there is some general guidance. 

What do you want to shoot for as a career? Do you want to do research in an R1 at the expense of all else? And a top-name R1 at that? Nice goal, but few achieve it. But studying at a top institution gives you some background for that. Or do you want to teach and otherwise do some good? 

There is very little worse in a doctoral program than having a bad advisor. But bad means someone who isn't very interested in your work or is hostile to you or your ideas in some ways. Browsing around this site gives many examples of the horrors. 

Having a high prestige advisor, from a high prestige institute (or not) will be a help for you in getting your first job, but it will decline after that quite rapidly and you will stand on your own. On the other hand, if the advisor, from wherever is connected to many others in the field, you can enter into many fruitful collaborative arrangements through the advisor and these will serve you throughout your career. 

But the high prestige advisor may be too busy to give you the help you need, or, since you have your own ideas already, too disinterested to help you when you really need it. 

But, it would be good to think long term about what you want, and the best choice will depend fundamentally on that, not the other factors you mention.