I would go for the '05 for the reasons stated above and the better resell value. You're also more likely to have problems with an '04 that has been sitting on the dealer's lot this long... (Flat spotted tires, rusty rotors, battery...) mind you some of the '05s may have the same issues, my sat for 18 months...
One thing for sure you'll be getting a lot of car at DC's expense...If you don't mind saying what exactly are they asking for the '05 Limited? Based on what I have seen out in SE Michigan, mid $24k to low $25k without NAV and before tax and registration fees.