I think it's fair to say that, in the timeframe mentioned, the RAF will be concentrating on some mark of F-35 as its offensive platform along with an unmanned adjunct developed from Taranis et al.
As such a Typhoon replacement will be primarlily an AD platform with a secondary strike capability - the same role the Eurofighter was originally designed for - and a good match for the Japanese requirement.