You could look into a TOM with roller saddles (if you use your tremolo), you just wrap electrical tape around the TOM cups so they sit firmly in the existing holes. But its a crude modification in my opinion, if your not happy i'd certainly consider fitting a TOM permanent or kick myself for not buying a CP model.
The stock bridge does work fine, it just takes time to set it up right. And yes its meant to move, but like any floating tremolo it returns back to point zero where intonation should be right. Its only when you physically move it back or forth with your hand the intonation will go out.