Karlos,
Changing manifolds will not help I'm affraid! The problem is that your engine is only 1600cc with a 60 trim compressor! You need to make some quite serious VE changes to make a 60 trim work on a 1600cc.
If after you have tried all your basic adjustments (less actuator preload gives less surge, NOT more preload as advised!!!) I would simply change compressor to a 55trim, as you're wasting your time with the 60trim!