Yes correct, replace tb and knock sensors and then newer engine will work with older ecu and harness
Or just replace tb connector (you will need just correct housing and wiring diagram, pins themselves are compatible, so no soldering required)
Newer knock sensors use studs for mounting, undoing...