Disclaimer: I know nothing about music, so just a random opinion.
McGill - Too risky.
If it were me and the faculty were willing to work with me in spite of it not being their focus, I’d spend the extra year for the UMich name. It is not unheard of to have faculty from other universities and departments (gender studies) on your committee. Ann Arbor is a lively college town (or it was pre-covid) and Detroit, Toledo, Cleveland and Chicago are accessible for weekend trips.