How many times have you been without the car due to the SAME problem.?
(you mentioned a persistant problem fixed in Jan./Feb.)

Do they not have a LEMON law in Canada.?
I would be insisting they get you a brand new one just like your original,
and save the mods for that one..