Not sure if 06 and 07 are the same type of mechanism but mine was 2 ball and sockets holding the mirror in. It was hard to get myself to push hard enough to pop it back in. I ended up getting a new mirror and changing the cap, as you mentioned.
I saw one video on changing the cap. It looks like you just get a thin blade screw driver and pry and pop off. I guess is best to pry at bottom so if you nick it it does not show. Is it held by fingers and goop or what?