Hello dave_the_brave. Love the name - it fits you for trying to make this work!
Question regarding your 1) and 2):
Is the attached module you provided already implementing (or at least attempting) to fix 1) and 2)?
Or are you saying that 1) and 2) functionality still needs to be added?
I will be happy to install and test all efforts on this.
Thank you so much again for your work.