Rather than Changing the Collation on the server to Match the Database, Why not change the Collation on the database to match the Server.

As you correctly spell out, it leaves the collation on the individual columns in their original state, but it is a straightforward process to set up scripts to change them