K&N makes the Typhoon kit in short ram or CA style for your S2. The better kit though is the K@N FIPK. At least acccording to K@N.
http://www.knfilters.com/search/appsearch.aspx
Link is to K@N application search. I went with the FIPK kit and am extremely happy.