Would you jump on a first gen M2 or wait for a GTS/CSL version?

SCOTT just mentioned that BMW MAY be investigating a more hardcore M2 with more cues from the vision GT. Personally, I am extremely interested in a more intense M2 but will still wait to determine if the base M2 will meet my needs. Things that may have me wait until a possible announcement of a GTS/CSL version would be the lack of a CF roof option, weight > 3400 lbs, the N55 not having the initial HP desired or tuning potential. If a buffed version would to be announced within the first year of the M2 with CF roof, the S55, better looks, and a price 10-15k above the M2 I may just have to wait... God damnit