Thanks Jeff and Douglas (and thank you Douglas for your PM on the shutter of my Sonnar too!).
Continuous focus range was what I was looking for. Seems like I will go for the 21mm.