Shawn - I'm fine with option A, only in the interest of time. The reports causing us problems are the OOTB reports that we've added parameters to (and in some cases, an attribute or two to the output). Would it be the OOTB SQL causing the issues, or only the SQL that we added to the reports?
Actually, my preference would be that we use Option A until we can look at each report and remove the necessary tags, and then switch the security setting back. This solution would not delay our upgrade, and allow us to eventually return to the recommended state.