Does it still make the noise with the amp disconnected like before?

I got a funny feeling that your original amp was fine, and the reason why the sound stopped was because removing it broke the circuit.

Maybe try bypassing it and see if the noise is still there as it will rule out the amp at least.