A big part of the problem is academic pigeon holes (musicology, performing, teaching etc.) when in real life these things overlap. Based on what you have said you want, an institution that will let you get involved with everything going sounds the better fit for you. That being said I would personally email every department you mentioned here about your interests and asking what they could offer you in line with this (remember you're interviewing them too!)