I ended up buying a USB isolator that isolates the power and ground wires from the pc.
Nothing I tried worked. I have good clean grounds on everything but the second I put power to the charger the noise is there. If I disconnect the ground from the charger and just leave the postive connected the laptop still shows that it is charging.
My problem is fixed but I thought I'd mention it for the sake of others who may come across the same problem.