I know you said you wanted two primes. So if you dont want the ultrawide capabilities grab the 12mm f/2 instead. If you dont think you need the reach you could very easily swap the 40-150mm for the Oly 75mm f/1.8. Personally I think it is a no brainer to get the extra reach especially if you want to keep your kit to a minimum because of the quality of the 40-150mm but that is up to you.

I think with this kit you get everything you need. You can go from 14mm to 300mm and still have a pancake for when you want to go ultralight. The 12-35 f/2.8 is better than the 20mm f/1.7 imho because it focuses extremely fast and it gives you the zoom you need if/when you do actually need it.

I threw in a Oly 60mm f/2.8 because I shoot macros and can use the 60mm as a portrait lens if necessary but that is just for me. Good luck!