I have 315's on my truck, and I get 16-17 MPG mixed city/highway. I'm lucky to see 13 in town. Your tires are a bit narrower than mine, so you should be able to do at least that, even with the big sticks. I don't know how the heck you got 22 before. Want to share that for those of us with stock sticks?!?
So far in my tuning I've found the most effective thing is adding timing. Your timing sounds close to what I have, but with big sticks you may need a hair more. I have 6 degrees at 1600 RPM, and 8 degrees at 2200 RPM. 6 degrees @ 1600 just gives me a hint of timing rattle, but the 8 degrees @ 2200 is smooth and quiet.
The trick to killing off the rattle was to adjust the pilot injection timing. I added a couple degrees to the pilot timing table, which got rid of most of it. Still a little more tweaking needed. With larger sticks, you'll probably have to play around for a while. You may actually need to subtract pilot timing, I don't know.
I know this is with stock injectors, but hopefully this helps some.