Need advise.

[TripleBlkZ]

Will try to make a long story short.

-June 2010 Leased a 370z roadster.
-Summer 2012 roof started to get a hole in it, repair by dealership under warranty. saw repair cost ~$5000.00
-April 25th 2013 went to put top up, back lid opened, top didn't come up....took car in. Turns out to be broken cables and module. Car returned May 2nd to me, briefly saw cost of repair ~$7000..under warranty.
-Return car home May 2nd started to detail it, saw lid now not allined and front of roof hitting beam above front window causing rub marks...
-May 3rd 8am at dealership showing new issues from repair, car booked in May 7th to fix up everything.
-May 3rd 4:30pm left work, open top, heard crunch, returned to dealership. While top was going down it caught the leather fabric inside the holding area of roof, torn it way from car. Dealership made sure there wasn't any major damage to roof and said it will be fix on the 7th I was ok with that because its the weekend and really nice here didnt want to be without car. Went to close lid after inspection and no response to control as same problem from the 25th...now have altima loaner....

Question I ask, lease is up May 18th, warranty also expires then. I had every intention to buy out car but now with the issue I have had even though its not a common issue but very costly when happens I run the risk of roof issue when there is no warrenty and coughing up a possible huge bill. Never had any other issues with the car but the above.

I could:

A) Return car take the equility and buy another 370z. Only owe ~25k full loaded nav/sport roadster 13,800km. Think would only get maybe 10k from dealer
B) Buy out car as planned, could have the 25k paid with in 1-2 years, sell private and make more then the dealership would offer. Base roadsters are selling for ~39k, I would think I could get 42k-45k with it fully loaded and little km's on it.
C) Buy out car and buy extended warrenty for ~$2500 but doesn't cover roof fabric only motor.
D) Sell either private or dealer and buy something else..

I am leaning towards "C" just for the fact I can sell the car private and make more then the dealer would ever offer, and since I now have the entire roof and electronic's new I would hope they wouldn't go out again.

If this was you car what would you do? not making this into a complaining post just a what would you do post....