Daniel can you say whether this be addressed as a bug or issue in the future? This workaround is not satisfactory amelioration of the issue as it’s advocating to go against standard practice regarding instrument changes, which should occur as early in advance as possible.
A better solution for the time being would be to keep the cues placed as they are now and merely drag the instrument indication in Engrave mode to m. 212 in this example.