I think you've reached a conclusion on this that will resolve the known issues.  Make sure you're confident.