If you've got time, could you try my patch with PaperWM then to see if
it does the job for you?
I'd like to get some feedback before merging :)

-- 
Pierre Neidhardt
https://ambrevar.xyz/