I say mcgill should be you're first choice. Being in a french speaking environment for a semester will definately help you perfect your french which is something you shouldn't drop after having spent time learning it.
Aside from that its an amazing school
.