I also am having the same problem with my 2001 non-s. I hear a lot about the 987 upgrade. I am not sure if it is right for me. I do not track my car but I do have more of an "aggressive" driving style. There are a lot of threads on this subject but no real definitive answer that I can find. Can someone tell me if the 987 upgrade is better than an OEM replacement or is it not as clear cut as that?