Shuffle would certainly help with that. I felt like I was expending a ton of energy and time shuffling mentally (but I'll concede that if I did it enough I'd get faster at it).