OK.
I just went to the garage and took the original cap off
my 02 and put it on my 07.
and took the 07 cap and put on my 02.
what I have learned.
the caps both fit the same.
the force it takes to reach the click is much
greater for the 07 cap, it gets tighter before it
clicks.
I have not tried my flush mount cap on the 07.
I may before I refit it to my 02.