You've probably already gone, but, if not, I'd ditch all those primes and replace them with a 24-105mm.
In my Sony kit, I just returned from Australia, with my 12-24mm, 24-70mm and 100-400mm. Used them all, with great results:
https://www.flickr.com/photos/dcstep...h/40644891082/
https://www.flickr.com/photos/dcstep...57666249669418
Never once longed for a prime.