Sorry to bump up an old thread but I'd love to hear what you decided and how it went and any other comments. I have the exact same dilemma in reverse:

Option 1:
OZ JFK-ICN in F (which by the time I fly will have the 77W and therefore the new OZ F Suite)
1hr 20m layover
OZ ICN-NRT in Business (A321)

Option 2:
United JFK-ORD in F (737)
2.5 hr layover
ANA ORD-NRT in F (777 w/ old first class seats barring a switch to a 77W before my departure date -- they do have a 77W on this route but the timing doesn't work for me as I need an afternoon departure)