Yes the old walz can be a bit tricky now and then!
There is actually quite a bit possible within this rythem, you can get a nice shuffle going when you "lean" a little bit into the next bar, sort of stealing a little bit ahead
. I hope I make sense, it is not easy to explain. But.... before you know you end up in swing-four!
A good cure for all of that is to play along with a good rock-waltz like "The Last Waltz" performed by The Band at their last performance together, there is a fabulous DVD available as well from that concert!
If I remeber well the drummer was Levon Helm.
I hope this helps you a bit, no doubt some of our fellow drummers on this forum will have some good ideas.
Cheers and happy drumming,