Spec, I have gone over this situation (Your Option 1 and 2) several times in my head and discussed with others too. USCIS is unwilling to use Filing Date and as you said, CO will basically have to use Final Action date as he was using before - move it aggressively one month to generate demand and then retrogress. Similar to what he did in the past when there was no Filing Date. I have a very good feeling it will come to that.
Giving USCIS any sort of power in the Visa Bulletin is a disaster. They control Filing Date and hence, it is non-existent at this point. It seems they do not like the Filing Date concept and wants to do away with it and at this point, I too think it is best if it goes away.