The 12mm is a really good fit, with some overscan.  A 12mm macro like this one, should have been the original choice for this hardware.  For the active picture is so near 1080p.  It would be extremely unlikely that 16mm macro, with no overscan would work in this range, without being a custom...