Creating a complete rim

Hey guys so here is my delima, I created a rim system for a lens using the Wrap feature.(1) But I can't figure out how to make the rim one complete piece, using the Wrap feature it seems I get a gap at the edges. (2) Another thing is the rim is supose to go into the rim-slot. So I was wondering if you guys have any suggestions on how to make them line up easier to fit into each other? Attached the pictures labled RIM are from the first problem and the pictures labeled Pocket are for the second problem. Thanks for the help guys, I appreciate it.

SolidworksParts And Features