I would say this is a classic case of it it ain't broke, don't fix it. :) Your suggestion isn't bad, but as you said you'd probably trade the current problems for new ones. And given that implementing this would take work while leaving things as is doesn't..

Makeshifts last the longest.