Making the assumption that the schematic was correct, I tried implementing it and I am cautiously optimistic. It seems to solve the issue and I haven't seen any bad effects yet. Will try to live with it for a while and see how it goes.

Thanks!