A s-afc is what you would want to get. It will do what you need it to do. And since you have a gen 3, the s-afc will actually be effective, since you don't have the stupid afm. I am suprised to hear you gen 3 runs rich. Most of them don't. The stock maps are pretty damn good. Have you run it at the track, or put it on the dyno yet? Also, do you have any pics of your swap or your clip?