Grinder Upgrade: Maestro -> ??

Question

I'm thinking about upgrading my grinder from the Solis Maestro to something else. I drink mostly espresso using a Gaggia Baby and am generally happy with the results - often I fail to get the magic 25-28 seconds though and the pour ends up being long or short (and the next click either way either chokes or gushes) I do occasionally grind for French Press or vac pot too.I see my options as follows: - Rocky - Innova + keep the Maestro for press/vac (from my understanding the Innova is not good if I need to constantly adjust the grind from one to the other) - Save for longer and get a Mazzer Mini - Find a used commercial grinder - Any other choices to consider??Also, does anyone have any ideas where I could see/try some of these choices in the SF bay area?Thanks, James