39 degrees wide open? Thats the reason for your knock. Check base timing something is not right. Do like Halon says ground the pin on the firewall and set it with a light. Also check for boost leaks and for a bad knock sensor.
And yes the higher compression engine will mess things up. Get something better to tune with. ECMtuning.com or your
Threaded Mode