Thats a better job than I did...I broke my plastic behind the light, but I repaired it.
If I could do it over again, I would do it like yours, that bottom rubber grommet is important to keep the lights from shaking, but I found another solution to stopping the shake too...In fact...that reminds me, I need to find the other piece to help stop the headlight shake.