another thing you can do (but i know you wouldn't like that) if anything else is pointless... (i fear it is with 25 in agility) is:
to take a more or less recent save (beginning of Act4 or just beyond) and improve agility... hmm...
sure that doesn't help... but anyway i'm a bit astonished you're gone so far (normally the "good" proportion for a warrior is Strength=2 Agility or Strength= 2.5 Agility and you're really far from that!)...
for unlearning DK skills... i don't know if it is really efficient because he has his own stats and skills in the end (well at least partially)... maybe.