I would have to go with AA because of the upgradeability too (as long as I was assured of a cabin and not a coffin - but let's not start that discussion again eh
).
Although AA's J seats are old, tired and worn out, I seem to remember the JAL flat beds to be limited on the padding and similar to sleeping on a plank of wood.