When using piston lock, you can put it into the 8mm hex side of the wrench to strengthen the usage of the piston lock.

 
When lay it aside, you can keep the piston lock with screwing it into the screwed hole 1 or 2;
6-way wrench meets most of your demands