Yep thats basically the best way to go around it. I don't see any other alternatives.

 

Did you ever resolve this issue? I ask because I had the same problem. I tried 3 different sets of rotors and pads (OEM, aftermarket, etc) before I gave up and took it to the dealer. They finally replaced both of my front hubs (yes hubs) and rotors. This finally resolved this problem. Can anybody explain what happened here?

Yes I always torque my wheel bolts.
Yes I always bedded my pads in correctly.
Yes rotors do warp. I have 3 sets to prove it.