Canon 40mm stm vs Canon 24-105mm @ 40?

Has anyone done a comparison between these two? (I do not have either yet) I am going on holiday and think the 40mm on my 5d2 would be nice and descreet for general street shots. I can then also use my 24mmf1.4ii for landscape shots.

I guess my real question is should I take:
Option 1-
Canon 24f1.4ii
Canon 40mm stm
Canon 85mm f1.8

Option 2-
Canon 24f1.4ii
Canon 24-105f4

What would you take out of the above two options?

Currently I shoot a lot of primes mainly 35f1.4 and 85f1.2 but I do not want to take all of those due to value/weight and stealability.

Thanks for any advice.