Wordpres core-update theme renames theme folder name

My first instinct upon reading this was that a WordPress Plugin may give you more control over this behaviour. Have you considered writing a plugin to pull and apply the updates?

A quick Google on the subject found this:

https://github.com/afragen/github-updater

Any use?

Likewise, reviewing their implementation may give you clues as to how to address your issue.