Way to auto-convert from "Household" to "organization" layout without deleting the NPSP "Household" setting entirely?

Hello!   I realized that even though I thought I had mapped my fields carefully, somehow all the "Company" fields of my contacts populate in "Primary Affiliation" and default the Account name to "XXXX Household".  While I may find this helpful from time to time, my focus is primarily corporate-facing (as opposed to individual donors).  So I have 2 questions:

1. Is there a way to change the default setting on this, so I don't have to delete the Household Layout in its entirety?  
2. Is there a way to bulk change the existing company info that is in the "Primary Affiliation" field?  In a perfect world, I'd like the exact opposite where the company name is the Account, and the "Primary Affiliation" is the "XXXX Household".

Thanks in advance for your help!