Olympus will have a 7-14 lens available in 2015. It won't be a fisheye zoom like the tokina but may (or may not) offer close focusing. If you were to buy an EM1, I would think you might want to get the 60 macro and 8mm fisheye lenses and then see what the Oly 7-14 looks like for you when released.
Panasonic makes a 7-14 currently, but it does not offer particularly close focusing.
I assume 12mm (24mm equivalent in 35mm terms) would not be wide enough for your purposes, otherwise the Olympus 12-40 is nice and allows pretty close focusing.