If you're using a metal control plate, all grounds should go to the volume pot. Grounding the tone pot, whether from the vol pot or with a separate wire, will cause a ground loop. It's already grounded by being attached to the plate.
So, in you're current diagram, try removing the ground wire from the tone pot.
If you're not using a metal plate, then all components need a single path to ground like in your original drawing.
"Thought that is no longer limited brings experience that is no longer limited" Marianne Wiliamson