This can be done with 07s, ya? I ask as you mentioned a difference with the 05 and 06 lights.
Is the difference you speak of only concern the frosted lens or are other aspects (most importantly, fit) affected?
There is a local set of RX330 AFS lens and buckets for 50 bucks.