I am still fairly new to photography but I have so much fun with it that I am can't help myself but for the "optimal" kit for my needs. I love shooting wildlife and panoramas, which are probably my too favourite types of photography, although I do quite a variety of other stuff too (weddings & family gatherings) so need to bear that in mind too. I currently own a 600d/T3i, a Siggy 18-250 and a nifty fifty. For wildlife I borrow a friend's Canon EF 100-400. I use it so much, I'm considering buying my own.
I am planning a few trips over the next year or two including a road trip around the Canadian maritimes and another safari to East Africa.
Especially for the safari I'd like to buy a second body. I can't decide whether I should go for the 5d II for the FF for panoramas or go for a 7d for the AF and reach. As well as the body, I'd like some new decent lenses.
For the safari, i was thinking a 5d II with a 24-105 (€2,600 body+lens) paired with my 600d with the 100-400 would work well. I think apart from the safari, I'd get more use out of an f2.8 lens, so was considering the Tamron 24-70 instead (costs €2,700 body+lens). Is 24mm wide enough for decent panoramas on a FF? From what I've read it should be but I'm not so sure. I find 18mm to constricting on my crop.
I would also consider getting a used 5d MK I (€800 body only) but not sure if it is up to the task
Alternatively, I could get a 7d (€1,275), an EF-S 10-22 (€700) and either an EF-S 17-55 (€850) or the Tamron (€1,100 when bought alone). I like the Siggy for a general walk-about lens but it isn't great; it is all a bit a compromise lens imo.
I reckon the 5d III is probably the ideal body for me, as it seems to be a decent all-rounder but i'm not sure i can justify spending €3,500 on the body alone given as that would leave me little to no money for lenses.
I would also consider alternatives to the 100-400. I like this lens but I always find the push-pull focus takes a bit of getting used to every time I switch from another lens.
Time of purchases would probably be additional lenses this summer before my road trip in Canada/US and then additional body next year in time for my next safari.
I appreciate any comments/thoughts.

