High no-load current on Astro 15G?

I have an AF 15G (10 turn) with a 2.38/1 GB. It has been giving what I consider low flight times, 5-6 minutes with a CP2400 x 12 pack, so I decided to do a little investigating. I ran the plane with an APC 12-8E on a freshly charged battery and got a 37A reading on the Whattmeter after 10 seconds. This seems high.

I removed to motor from the plane (LT-25) and removed the GB to check for a bent shaft, it is straight as an arrow. I removed the brushes to inspect them. They look great, as does the comm.

Here's the bad part. I checked the no-load current with a Whattmeter and a 7-cell battery and it was 5.6A! According to the FAQ here and the Astro web site it should be 2A. I loosened the 2 adjustment screws and turned the rear end bell while running and the current went to around 15A so I moved it back to where it was and it returned to 5.6A. This was as far as I could go with the adjustment because of the width of the slot between the magnets.

Does anyone have any idea what could be wrong? This motor has about 50-75 flights on it and I remember checking the no-load current when it was new, and if my feeble memory serves me correctly it was 1.8A. What could have gone wrong? Does my motor need a trip to Astro Bob?