Same experience for me. I've ended up using Karabiner-Elements. With less than 10 rules (half of which are only for the browser), you can replicate the Windows layout on your Mac, it makes everything much easier.