Remote Debugging with NEXT Command

I'm doing remote gdb deugging to a stub implemented on the target over 
tcp. SI works and NEXT works well enough skipping over a function call.

What can be very slow is NEXT from one C statement to the next.

When NEXT skips over a function call it implements it by setting a 
breakpoint at the return address.

When NEXT skips from one C statement to the next, it does it by doing 
repeated SI's. This forces the target to send back a bunch of state at
each SI. This is slow and very slow if the C statement actually has a 
loop in it.

Is there any way around this other than carefully avoiding NEXT in the 
worst cases and manually setting breakpoints/CONT?