I don't know man. Did you see on the video that even with Linear he also still has an AC leakage of 12V Thats much more than what you have right now, despite his linear supply.
I think what you have now is a very good balance between simplistic and effective, and I will copy it.
The only think I might try is a 1M resister instead of a 100K, you said you tried but I did not quite understood the result.
I am not at home right now, otherwise I would be testing myself. This thread seems to make it all very important, but I just did not pay attention before and everything seems to work. That is why I think that the 'floating' cannot really source any current, and we are being oversensitive.
In defense of the mod suggested on the video, it was 12VAC but virtually 0 current (below 1 uA, apparently).
Anyway, I suspect that the optimal (or "good enough" solution) will be different for every user, depending on what they will be using the device for, and whatever lets them sleep at night.
For instance, I'll most likely follow the steps of beanflying and yourself, and simply use a bleeder resistor, because it's simple and apparently works a treat, but I'm sure a number of users would prefer to ditch the switching supply entirely and put a linear one in there.
I still hope that the unit I receive will not leak badly. It happened with the FY3200 that users were getting different voltage and current values for the "leak" (probably different hardware revisions, but could also be related to the difference in mains voltage and frequency between countries).
I guess it's like they say: "Your leakage may vary".