Also, assuming it all goes to plan, even if you pay, you will only be eligible for WTP tier points and avios, whereas if you'd been in a paid CW fare, you'd get the full F benefits.
(And I'd certainly take CW both ways over CW out and WTP back, if it's a question of which one to upgrade).