Use a smaller kite, seriously, I don't know how powered up you usually ride though but most people are overpowered when kiting in waves, if you use the smallest kite possible to get you back upwind (even if you have to work it a bit) you won't get dragged down the line as much when on a wave with the kite parked, so you can use the power of the wave more, you will be able to throw the board around more and the kite around quicker when needed as well
It is easier to go to a smaller kite if you are strapless because you can move you feet around more to get the best trim to go upwind but even if strapped try using a kite a metre or two smaller than you normally would, fly it aggressively and work that sucker.