Difficult to say where you should be with the mods because you don't have a stock baseline to gauge the delta (gains) off of.
EX: Most stock M3s dyno around 350 WHP, so after adding a tune, pulley, filter swap & catless exhaust most people see 400-415 WHP (a 50-65 WHP gain). SO at the end of the day, it's the delta that matters the most to make sure that the gains are consistent with the mods installed.
Since your warranty's expired, I'd look into Evolve, Bren Tuning or Mike Benvo retuning the car if you're gonna stay N/A. They've all had really good, consistent results from their tunes & focus more N/A setups (as opposed to ESS/VF Engineering/Gintani who focus on their S/C applications but also make N/A tunes).