I would rather see a complete fix and some interim solution such as #2. I have no problems waiting for a proper fix with 1.20. Many people may have invested in colored gear as is and tailored their materia to them. With all this new gear, it's economically hard on some who would want the new colored gear but cannot obtain them due to the lack of gil.