Can you show a screenshot of what you mean by waviness? For the floating geometry, does your cage fully cover the floating elements? Are the floaters selected in the highpoly mesh list in RTT?
Only problem Im having now is Im still getting tons of waviness on flat surfaces...and for whatever reason, my floating geo isnt baking into the normal map..