If you haven't done so already, you should have the dealer look at this. The'07 trannys significantly smoother and quieter than previous year models. If it's clunking in every gear and is actually harder to shift than your '04, something's definitely wrong.