Swapped the upper and lower traces. No DRC errors.

Was also able to get the switch in, after much trouble.

 

Is that a heatsink for the U2 regulator outlined in yellow?
I'm thinking of something like this:

 

Not using the 7806. That position will not be populated.

And yes, that was the heatsink I was going to use.