I would try and stretch your mechanical skills to changing the spark plugs. You might be surprised at how much a fresh set will crispen it up. Mine typically seem to go off at about 6000 miles, but not always.
If that makes no difference, I'd get the injectors cleaned and after that think again about a re-map if there is no difference.
BTW, it's no good re-mapping or dyno-ing unless the plugs, injectors and valves are all spot on.
__________________
|