Based on what you said, Shimano. You already have spares, and you already know their systems, and their brakes (I assume you are also familiar with) are a bit easier to work on. As for future proof, 11-speed will be around a long time, you'll be ready for a new bike or a new group before you can't source Shimano 11-speed parts.