Hi,
I have (had) the same problem. I bought a replacement windshield from Dana at Shell Valley. Dana informed me that the windshields are the same for both cars (his and CR). Although I have not installed the windshield yet, I highly recommend Dana and his team at Shell Valley. Great people and superior customer service. Give them a call and talk it over. Good luck!