I find I tend to use !:x as in !:1 !:2 and so on instead of !$.

!:x takes the x parameter from the previous command, so from “mv /test /nexttest” !:1 is /test.