With v3.14.1, we have now introduced the option to claim a gateway that’s already claimed or registered without needing to delete it. 
Here are the instructions:
https://www.thethingsindustries.com/docs/gateways/thethingsindoorgateway/
cc: @descartes