Update for completeness: The EFI patches have not made it into 6.0.7. As expected, 6.0.7 from Debian still has the problem.
New EFI patches have been merged into master on November 4. I hope to find them in 6.0.8 or 6.1. Then I will test again. Regards