Go with what you want to drive is the best advice I could give.
Look you've tried out the mini beamer and it worked for you, now do you want to stay with that or upgrade? It's up to you.
They both auto or stick? If you do a lot of traffic jams you are gonna hate standard in grid lock, you'll get home and your leg will be all cramped up from clutching.
Also you have to consider the cost of insurance, if you're young like me all that extra power is going to come with extra cost. But let's not kid ourselves blowing the doors off someone at a traffic light is always fun!