No, F is still better, even on the 747. Is it better by the same margin as the typical price? Er... not compared to the upper deck, probably not even the £200/20k avios sale fare that you can get sometimes. But I wouldn't turn down a free upgrade.
Meanwhile a good crew in CW is miles better than a bad crew in F, even on a 777.