The Crystal City's a fine hotel, although the Gateway's definitely newer. Haven't been there in about 8 months, but its always a good option. Don't forget about the Key Bridge Marriott too - great location. Crystal City & Gateway have a free shuttle from DCA though.
If you're in town on Thursday the 13th, join us for the DC Happy Hour at Hotel Washington!