Did the exact same thing last summer for the exact same reason, with the exact same motor! My advice is that if you are going to do this, start looking for your Terrova now, my local dealer told me June for availability on the Terrova. Started searching online from BC to Quebec and found a new one in Laval. That was it. Sold out, unavailable, backorder etc was a very common theme. Fortunately for me I was going to Quebec twice last week and was able to pick it up with no shipping costs.