I have a better advice. Get a second body, preferably the same as your first. Use two primes, wide and longer. Or wider and normal. Perfect with Leicas, as they are small. Same with Pentax, because it makes some nice small SLRs as well.
Good light!
fra
