Yeah, I think I've pretty much settled on keeping Cloister as originally written, despite the amount of (quite interesting!) debate around its price and relation to Duchy, and the alternate orderings of trashing, +VP gain, etc.
Labyrinth I'm still keeping in limbo for now, though I'm leaning for the moment to the $4 version I posted last. But I'm waiting to see where eHalcyon's game ending thread goes.