For 18k Avios I would do it immediately. I've had two F experiences (one op up, the other Avios up) and they've both been superb and noticeably more enjoyable than J. Note "enjoyable" not necessarily more comfortable or better sleep or more convenient but more enjoyable.