You have great insight. Just want to share a tool you can use for version control which is Go Abstract, it will be very helpful for your team and expedite your merging process. Also, just keep consistency intact through out the wireframes. It’s better to have one button type with different variations than to create two different button types (i.e. rounded and rectangle). So that by having one type, it will create a more consistent experience for users. If you plan to have rectangle buttons, keep it and add variations like, fill rectangle button and border rectangle button. Then, use them depending in info hierarchy or product goal. If your goal is to onboard users, you can use fill buttons for “Sign up” and just border button for “Login” 😊

But nonetheless, I’ve learned something from your article. hope to read more!