I think it would be best to use this change as a way to bump up the priority for the Re-Evaluation thread you linked to. That way we don't have to change everything, and then change things AGAIN when we finally decide on a method to "fix" all of the Enhancement/Recipe articles.