I agree - if you can upgrade your return before your departure, go for it and hope for an upgrade on the way over, where an op-up is perhaps more likely (but still unlikely).

What it comes down to in this situation, however, if whether you'd like the J seat for the long flight over, or the overnight coming back.