Yes, back to basics exactly as Brct203 said, that is where I would go.
And Brct203, I think with the typical 3 or 4 arm feed holder you are correct, of course with a buttonhook you can easily adjust focal length and F/D ratio independently of each other. As long as your focal length is good...