Is the 3.5F better than the Automat? I seriously doubt you will be able to tell the difference between the photos.
The 3.5F is a wonderful camera, and I have one, but would be equally happy with a working Automat.
It's not the camera, it's the lens - and Rolleiflex lenses are all good.

Jump in, the water is great!