I would go for the 07 and you can easily add the aero kit.
No one knows what the changes will be for 08 and who knows if there will be a cost adjustment. I would only wait if I was interested in a turbo six.
Then again I bought my 4.8 in April.