I'm not a cam guy but I think #1 would be a shoo in. OT You might get an eddy strip kit (pick the one w sizes close to what you have now) & experiment a bit w the rods/jets/springs in your oe AVS (fill the domed metering rod caps w epoxy to make them flat like eddie/AFB ones are which is needed to use 2 step rods and 2 step rods require the shorter AFB/eddy jets as opposed to the taller OE AVS ones used w 3 step rods)