I think the 3sgte would have been alot better. Stock 3s is real reliable. 20v will probably last longer like any N/A motor will over a FI motor. Post plenty of pics on the swap. Nice to see more active celica locals on the forum.