Yes, you can enter your tax year (beg/end) on Line 5a on Form 7004.
Frankly, it's kind of unlikely that you'll get a corrected 1099 so you might want to go ahead and do the nominee procedure and dispense with the 7004.
