I would go with an AFB. All (OE) AVS's are lean due to the discombobulated gov't emission standards that Ma & everyone else was striving to keep up with. As you noted you can swap in eddy performer 2 step rods and short pri jets. put some JB weld in the domed metering rod caps then cover em with some scotch tape then turn them upside down so the mud will settle flat on the tape & let it set up for 2 days then remove the tape. likely there were more emission driven mods in the AVS's than just the metering rod/jet sizes. So if you have an AFB that you can rebuild that has tight bushings that would be my route. trim the cluster gaskets for an exact fit compared to the OE ones, rebuild kit gasket fit/quality can be poor & I like to lube the bowl screws with oil if they will be removed often as they go into aluminum.