Best thing you can do, you have spent alot of money to just f*ck on with it for the sake of taking it to them and probs a small bill rather than a large one with a fubared engine.
Your not that far away from TD take it down there and get them to look at it, you will get a definate answer and will more than likley avoid wasting time and money changing things thats dont need changing.