My buddy has a 1996 Pontiac Sunfire with the stupid passlock system that goes through the cluster and it seems to be acting up (again). He bought the vehicle with this issue initially, but after replacing the cluster, it worked great for about two years. We are having issues locating replacement clusters to repair the vehicle with. We are discussing an engine swap/upgrade in the hopes of upgrading performance and dependability, and if it upgrades, or eliminates, that stupid passlock system, that would be awesome, too! I am looking for input on either resolving the passlock issue or some guidance with doing an engine swap. We are open to either a 2200, LD9, or EcoTec setup, but just depends on overall cost of the project.