If I were u I'd double check the grounds and the tighten the fusblock connectors, since that's where your problem started.

I would also highly reccomend getting a real tune. Replacing the TCM will help nothing .