Grant signs new Stormers deal