Can't comment on the diamond upgrade value (I'm a lowly gold and prob. destined to be for some time)
If you go with the free nights route, note that the Silver Spring/Colesville Road Hilton is on a category 1 pointstretcher (6K) through the end of the month. Far and away your best value in the D.C. area.