Maybe we should stop calling the Contact List a Follow list. Contacts should include everyone you know, independent if you follow their feed or not.
Follows should be just another NIP-51 list.
The Follow button should be then renamed to "Add to Contacts" and, in that screen, you can pick the list to add them to as well, including a Generic Follow list for the main feed.
🤔