Buy a 2009 now or wait for 2010???

I find myself with a similar dilemma. I have a 2008 package 6 with 32,500 miles put on over the last 12 months. I am hoping to get a decent trade in value for either a 2009 package 6 or a 2010 package 4. My bumper to bumper warranty is almost up. I wouldn't mind the 2009 but what I like with the 2010 is the new driver seat and moonroof. According to kelly blue book my car is worth at most 16,000 on trade in and a new 2009 package 6 is likely to be around 25,000 with incentives. Any further thoughts?