if it were me, i'd go for a 20mm sapphire replacement. you said it yourself, you already have a solid set up, so why be impatient about the wait?
it seems these lab grown sapphires tend to go thru bad batches once in a while. it happened to CCA before and I remember it happened to D-nail before...