Ok here are the two files which at least on my pc work withouth swirl and drifting and it looks in my hmd like on video I just made now again to verify 
I hope time those are the correct files. Sorry for that.
h. file
https://drive.google.com/file/d/14Ew…ew?usp=sharing
https://drive.google.com/file/d/1LW8…ew?usp=sharing
Yes the additions in XY should be ignored. I coulnt send you the PR request to the current branch for some reason so I thought you would just copy over the stuff I marked with “spaceharry”.
Its up to you if you would prefer to make it a new component. I for sure wouldnt have a problem with it.