I'm looking at either the EF-S 24mm or a Voigtlander 20mm f/3.5