Don't panic Scotland isn't going anywhere.I'm not quite sure I fully understand your point. Scotland could very well have a vote in the not so distant future where one of the outcomes is that they are no longer part of the UK. Having a heavily Scottish based attraction in the UK Pavilion when the UK only includes England, Wales and Northern Island won't work and would actually annoy many Scottish and British people if that happened to be the case.
Saying all that, it probably makes more sense than Frozen in Norway so I wouldn't be surprised to see it happen.