Maybe CTS has another piezo which would work? I remember reading through older posts awhile ago that there were another couple of CTS models that you liked.
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Id like to know what those other models are as well if they are direct drop ins for the One and Two Pis.