With an amora, you'll have better color and no green tint, so if you are okay with a warm stone with no green, it will be perfect for you, if you want colorless, you could just wait until next year when the Amora Gem princess cut will become available. ^_^ If you are planning on upgrading to the Amora Gem down the road anyway, I'd hold off on switching the stones.
And ditto on the CZ tension settings, those can be tough to do!
_________________________
Equal Opportunity Bling Lover!