Congratulations and welcome back to M3.
I have been considering getting back into another M3 (this time a E92) too. I had driven the F10 M5 and really like the dual personality of it, but like you mentioned, the M3 would still be a better all around car and perhaps more fun too. There are a few Edition M3s around my local market and I just wonder if those are worth the additional cost over standard M3s now.
Must stop eating..............