Hello Adam,
Thanks for your patience and explanation, here's the debdiff with the solution I picked,
I backported the fix to 1.3.1-2, the version is 1.3.1-2+deb10u1 and I will need to wait until 1.3.3-1 hits testing*, which is fine (2 days), to upload it.
* because the current version in testing is the same as in stable, and the version in testing needs to be higher/bug fixed in there as well.