2006 XC90 2.5t non AWD MPG

I have a 2006 XC90 2.5t mpg non AWD model now with with 1500 miles on it. I'm getting around 13 mpg in the city and 23 mpg on the highway. My problems is that 95% of my driving is in the city. I have 1500 miles now. The city mileage truly sucks. The highway miles however are as advertised or a bit better 23.5mpg. I'm looking for someone who shares my issue and found a dealer fix for it. I called volvo and was told to wait until 5000 miles to allow the engine to break in. Not satisfied with this advise, I called the service mgr and scheduled a fuel consumption test. They basically checked the computer for faults and checked for fuel leaks. They then filled my tank and took it for a road test. Guess where they road tested it? You guessed it, on the
highway (23 mpg). I was told to monitor the next 3 full tank
fills/odometer/trip reading and do manual calculations. Then, if still
not satisfied, take it back with receipts for further eval. I'm on my third tank from full to empty and get 13.2mpg. Has anyone found a dealer fix for this?