I would go for the 35mm lens then. 40 is too close to 50, and the 35mm fills the huge gap between 21 and 50 nicely.