2-Xtras are a lot better head for your cubes, IMHO. If you're open to an intake swap and want to stick with Brodix, the 3-xtras come in 3 sizes, take your pick based on intended revs.
However, you should have plenty of power to run in the low 10's with what you have. There are quite a few folks here running low 10's and high 9's with less cubes.
Suspension details will help folks here get you dialed in, but you should be running your current times with your current combo with a plug wire loose, IMHO.
FCS Harmony Racing
'Cause if they catch you in the back seat trying to pick her locks,
They're gonna send you back to mother in a cardboard box...
You better run!