Do you plan to move to Optimism when that launches this month? From what I understand, little to no changes are needed on your the codebase. You should be able to just use their compiler and deploy.