Having thought about it, why not just swap to a M3 gts ?