I would strongly recommend the CRF 1600. Often I find equipment upgrades are marginal improvements. Or else they are better but heavier or bigger. This is a not only much better but the same size.
The only downside is the cost. Not sure how they compare to the Swarovski rangefinder but the Leica is much smaller and lighter - and being lazy this appeals to me!
However they are very hard to come by due to the high demand.
If you are in the UK then:
Red Deer Outdoors Home Page
Have one copy at the moment but I guess not for long.