I found it usually has more to do with your connections you soldered to your gshield causing the noise rather than your grounding, it’s a pretty common issue with the stock machine. I developed a noise filter that will address both issues as well as having your homing switches work as limit switches as well + some other great easy connections. They are for sale here or if you’re up to making your own pcbs I have posted the schematic on the forum as well.