Questions about 318 timing

If I did it correctly it looks like I have 21 degrees initial and 15 degrees mechanical, is this correct? What, if anything, should I change? I checked the initial at idle and the total at 2500 rpms.

Did it stop advancing at 2500?
Rev it til it stops advancing. If it happened to be 2500, great.

As crackedback said, if your all in @2500 with 21 initial, i don't think there's much mileage to be gained there. Is this a all stock 318? Might have to look at carb and exhaust to find some more MPG.