A little bit more info about the Rally GB situation in this BBC article. If it goes to Northern Ireland in 2020, it'd be back in Wales in 2021, according to Motorsport UK chief executive Hugh Chambers. No mention of Scotland or elsewhere.

https://www.bbc.co.uk/news/uk-wales-48292439