replacing all the wiring will gurantee
any malfunctioning problems. Especially because you have altered the wiring your self, diagnostics of your car isnt as accurate.
If you are looking for OEM parts for cheap, i suggest this site
http://toyotapartszone.com
they have pretty cheap parts
hope this helps