Had this issue too - over the rate limit for certificates.
Fixed by following your step #1 (commenting out the 2 SSL templates in app.yml) and opening up the site in another browser once rebuilt.
Assuming I’ll be able to reenable SSL once a week passes.