Just an update:
My timing is low right now, its at 10 degrees. I thought it was at stock 16 degrees but this is the fault of the shop that did my timing belt swap. I have talked to them and they will be fixing it for free.
I have replaced my plugs with some NGK platinums, replaced the rotor and the cap and my last tank was up to 25mpg. Still down from where it should be however. I was also driving like pussy. I used to get 28 driving hard.
Replacing the fuel filter did nothing for the mileage fyi. I didn't think that it would make a change either but it was old and should have been replaced anyway.
After my timing is back to stock and I then adjust my valves I'll let you fools know what exactly made the change in my mpg.