You can combine them and then turn off search autocomplete. Seems like the best option for me.
If you personally don't, then you can combine them yourself in Firefox right away: just remove the search bar entirely via the normal UI customization mechanism, and use only the URL bar, which doesn't do search autocomplete.
Based on the diffs there, looks like the 55 feature can at least be turned off by setting the "browser.urlbar.suggest.searches" preference to false... (That preference doesn't affect the search bar.) Also looks like there's preferences UI for this (the "Show search suggestions in location bar results" checkbox).
I think there were talks about not presenting the search box for new profiles, too, but it looks like that hasn't happened yet.