I would go with the second suggestion (rolling the chord) by all means. If you play the f with your right hand, you will use the thumb...in an octave...in a weak part of the bar...with stress on the melody...well, I think there is very little chance of not banging it and crashing the passage.
A smooth rolled chord is nice, and let you free to sing that top note.
Best regards,
Jay.