My drawing is showing exactly the same as the one you posted, only slightly re-arranged.
If you move the shunt into the neutral wire, and connect the cround clip to the end of it most close to the source (lowest voltage potential), you will not get a short. But, as you can see from some of my previous posts, you can end up with an unwanted current in the ground clip / wire.
The best choice to measure the voltage drop across the shunt is to use a differential probe or use two probes without ground clips and the math function in the scope.
Measuring mains with a normal scope is challenging, and it is easy to forget a tiny detail that will ruin everything.