I added the new code to the main portion of the site today. Yes, aesthetically it may not be quite as good, but I did not want to wait any longer.
I also put in a reconsideration I also put in a reconsideration request to Google, so hopefully that will get search re-enabled…