Ok, due to luggage restrictions I would go for the two gun battery solution.

1st set
416 Rigby, magnum mauser
8X68S, ZG-47 mauser

2nd set
375 H&H, magnum mauser
7X64, ZG-47 mauser

Plains game, birds and occasional leopard
7mm mag
12ga o/u with extra set of barrels in 9,3X74R

Cheers
Johan