One of the things to ensure when looking for noise culprits is to make sure power and signal harnesses are not parallel. There are places where the two do meet, and when they do, it's best that they are perpendicular. When they can't be, keep them as far as possible. The pic below is how NOT to route them,,,