I think we need to decide if we want to apply a sticking plaster, or fix the underlying issue.
My preference would be to fix the underlying problem, personally, but if folks wanted to use the PR above as a workaround if it’s an urgent problem for them and can’t wait for the work next year, they could do that.
The discussion should happen in the PR really, and a product decision made as to which direction we want to take and whether this solution would be required if we go down separating out the transactional/operational and marketing emails.