Waterloo CS vs DD for a quant career?

Hi,

I have been accepted to both the CS and the CS/BBA (Waterloo side) programs at UWaterloo and I was wondering which of these programs would be a better choice if I hope to go into quant trading in the future. Is the BBA degree really that much of an advantage or would I be better off taking more maths and stats courses if I do just CS? I also have the option of doing CS or EngSci at UofT, but is UofT as good as Waterloo for this career path?

EDIT: Also, is it worth trying to transfer to a CS/finance program at Waterloo (like CFM or FARM) or will those programs not be as helpful?

Thanks