Second the Noktor and Lumix combo but you already have the Olympus. Ever think about the always reliable Tokina 11-16? By the way, I do own the SLR, Lumix and the Tokina. The Lumix and SLR do not look anything alike. Is that Canon an old SSC lens? Just to see what matches up, I took the SLR, a Rokinon 24mm Cine, a Nikon 50 1.8 AI-s and an older Tokina 28-70 2.6-2.8 and filmed the same scene and they all looked pretty good next to one another. The SLR does always stand on it's own a bit and it might look pretty darn good with your Voightlander 25mm. It was hard to get a good one but the QC might have changed in the past 6 months.

Instead of Olympus 12mm 2.0, you could buy a pair of Noktor 12mm 1.6 and Lumix 14mm 2.5. The latter option might be cheaper. eBay sells the Lumix lens around $160.