Unfortunately, the figures are probably right because only certain economy fare classes are upgradeable with Avios so what you're seeing is the economy fare element rising when you request the upgrade.

A much better deal would be to buy the WT outbound with the WT+ return with cash and use the 25k Avios to upgrade to Club. Unlike economy fares, all WT+ classes are upgradeable.