Given that the way Signal presents contacts is suboptimal too (contacts showing up irregardless if they have Signal installed only someone else uploaded said contact), I'd rather have a mode where I have to manually exchange contact info until such time secure contact exchange is solved.