Hey Todd,
Forgive me for the basic question, but have you checked the timing and CO (mixture) levels? In addition, if you're cruising around town at 4000 rpm, that would explain the decreased mileage. Are these the same revs on the open highway?
Sherwood Lee
http://members.rennlist.org/911pcars