Metropolitan Police Department and Fire Service Act of 2007 - Amends the National Capital Revitalization and Self-Government Improvement Act of 1997 to require the federal benefit payment made to an officer or member of the Metropolitan Police Department or Fire Service under the District Retirement Program to include any amounts which would have been included if the amendments made by the Metropolitan Police Department Amendment Act of 2006 had taken effect before the freeze date, but only with respect to an officer or member who completes 20 years of active service before retirement.