Had the same dilema and went for AF +1 body since it was a better stat improvement and most of to get the WAR look back.
Was tired looking like a PLD