Raspberry Pi Camera CCD Lens gopro case

I wasn't able to find what I considered to be a 'good' gopro mount for a raspberry pi camera (v1) board that would accept an M12 CCD style lens mount separately from the housing.

I've had numerous issues over the last year with integrated mounts (where the M12 is part of the housing) getting out of focus due to the housing warping. I've found the independent M12 mounts work better in this regard, but there aren't too many housing I could find that play nicely with them, and I couldn't find on