Instead of the list of custom waystone names being exhausted and then only using the RNG ones, have the custom ones added to the list of names it cycles through. Optionally maybe a setting to disable the RNG ones and only use the custom list, and just cycle through it.