I'd say to try 5.3.8 kernel without the boot option workaround. If I understand correctly, the bug should be fixed there.