--> Remove t17 and replace with intermediate
I dont like shopper, but like keeping the proportion 50/50 for ground/rope schemes.
Would have to be BO1 though, BO3 can take quite a long time, potentially over an hour. Also, BO1 intermediate can be quite lucky so there would be variance. Intermediate isn't the greatest fit, but probably better than t17.
Also, all this talk of removing shopper and t17, you will make finland cry.