I think if you want to solidify yourself as the agile melee person, you probably want to go for something like stronger leg muscles: or mutated legs or something: That scratches the mobility issue, while also having the chance to be upgraded for strong leaps, more speed and perhaps a charge bonus/First attack bonus.