Thinking of this a bit more, probably the R-2180 is the most optimum choice, because while it has the same diameter, it's significantly lighter than the R-2600, thus alleviating some of the weight issues the R-2600 would cause an perhaps keep the F4F airframe more or less same as OTL, rather than pretty much a new aircraft the R-2600 required (which was the XF6F-1). The R-2180 was already flying before the war which is the reason for my choice, so if PW focuses on improving the R-2180 rather than waste time on the R-2000, then a two stage 1400 HP R-2180 would be ready just in time for the XF4F-4. Then late-war water injection R-2180 could do say 1600 HP, this powering the FM-2.
The post-war R-2180A (sibling of the R-2800 C series, or, very roughly, one half of an early R-4360 ) as installed on the handful of airliners was good for 1650 HP (dry) and 1800 HP ('wet'). On - wartime - 100-130 grade fuel.
Something akin to this engine, assuming P&W continues with development of the R-2180 line, would've been also a great engine for the 'Sea Mustang', as well as for many other aircraft, like A-20, P-40, very likely for the B-24 etc.
FWIW, the turboed R-2000 as earmarked for the F5U, was supposed to make 1600 HP with water-alcohol injection (and 1350 HP 'dry', but we kinda already know that).
Speaking of which, i never quite understood why they kept switching between R-1830 an R-1820 engines for the F4F, same like with P-36 models really.
Engine availability was probably the reason.
The 1st call on the 2-stage supercharged R-1830s belonged to the USN and, sometimes, the RN, but P&W could not make these as required in 1940-42.
Meaning that 2nd best engine was either the 1-stage S/Ced R-1830, or the R-1820, that had advantage of offering a bit lower cost, lower weight, and it was 1st to offer 1200 HP (but not for long).
USAAC had no 1st line aircraft demanding the R-1820 bar B-17s, while R-1830 was featuring in many of the late 1930s designs for them, leaving more of R-1820s for retrofit.
The R-1820 was also 1st to jump to the 1300-1350 HP bracket. The R-1830 probably saw a lot less of development during ww2. That, combined with R-1830 being mass produced at many places, meant that R-1830 became a cheaper engine by mid-ww2. Unlike P&W, Wright was very reluctant to have other companies make their engines.