My mate was lucky enough to be in a position to buy a nice car for high days and Sundays.  Always wanted a Ferrari, so went in to a Ferrari specialists and said that he was looking for a nice car to drive 3 to 4 days per week and commute during the summer about 15 mile each way.  Ferrari specialist told him to buy a Porsche 911.
  Said it all as far as I was concerned.   
 I would say the same about the Mas' your looking at.  If you want an ultra reliable super car that can be used to drive around town or use on a track day then Porsche 911.  Would not change what you already have, just update it. 
 I have a 1986 Guards Red 911, I can leave it standing over winter and it will start first time and still do over 150mph 
 
  Porsche 911 - only way to go.