Call Jim, Rodney, or Chase at Butler's and tell them exactly what you want the car to do, and what you have. They will tell you exactly what you should do so that you don't spend money where you don't need to. I've dealt with them for years, and they are straight shooters. I was just there in June and picked up a FAST EZ EFI kit from them and they had me come back and watch as they were bolting one on to a customer's engine. They are typically a bit higher than most other Pontiac shops, but their service is outstanding. The guys will spend all the time you need to make the right decision, and if you decide not to buy from them, they have no problems.
AU73, it looks like you are in Alabama. If you are in Northern Alabama, go take the drive over to Butler's place in Leoma TN, just across the AL/TN state line on HWY 43.