It feels less like the PT was scored after TPM and more like Lucas just said “Eh throw in that popular one from the first movie.”
Like the laughable Anakin road trip montage in AOTC that uses Duel of the Fates for some reason.
I completely succeeded in fixing it. (watch from 2:30 to about 5:30)
I tried to FTFY.