I struggle with exactly the same issues.
A major, major headache.
Did you manage to fix it, Peter?