I think that the cluster swap could possibly screw it up. the circuit must pass through the cluster for the signal indicator lights. are you sure that specific cluster is compatible with your year? I guess a test to see if it is the cluster would be to swap them and see if it fixes the problem.