So the one on the left is from the 2008, the one on the right is 2005. I think I can use the spring and tip piece from the 2005 now that I've measured both pieces. Hopefully it will work. Now i just have to find the missing pin piece.
It's my understanding there was a random issue with the 2005...