Don't think you'll be able to drop the flight from your flight+hotel booking.
Other than upgrading your booking to CW and further upgrading with avios to F as you've priced, the only other option I can think of is book F on the return and skip your existing WT+ return flight.