Good idea to send your machine for a check up. If you don't trust it now, you will have a lousy time in the field where you will really will not trust it.
On my CZ20, I had to have the little rubber pinpoint button replaced twice and on the third time had the CZ21 brass button added. It was easier with the rubber button to turn pinpointing off and on, but I guess I pressed it too hard, too often. So one minor tip, is make sure you are in the right mode after you pinpoint (ie. that you are in all motion when you think you are in all motion).
Usually when I get a strong signal, I don't pin point on the first scoop. If I can get the target right away, I am happy not to toggle back and forth. My policy is to dig all repeatable signals. I either hunt in zero or 1 discrimination, never more. In a heavy junk area, I disregard targets that have multiple tones. I probably miss digging some good targets with this approach, but I compensate by covering more ground.
A quick double low tone beep on a sweep is usually a nail. Canadian clad coins, especially the recent $1 and $2 are made of junk and the detector tells you so. If you want to find them, they will be low tone (iron). The sweet tone is the repeatable mid tone. Pull tabs and 14kt/18kt gold rings. A man's ring almost always gives a strong signal up to about 8 inches. A thin ladies ring is more difficult to hear, especially at depth.
I also have a CZ21 and honestly don't find a difference in the effectiveness between the two machines.