In addition to that, if you got a 2019 (I think) or newer and it was one of the "11kW" models (only a European thing I think) then while those have the newer motors they also have a lower thermal thermal limit programmed into their firmware so they'll cut the power sooner than a 2017/2018. So, if you can spring for a bike that's a year or two newer it could be worth it, factoring the increased range from the larger battery as well. That said for an FX and what you'll probably be using it for the overheating probably won't be an issue, I have an "11kW" DS and I only lose power if I'm sitting at over like 75mph for an extended period during Summer or if I hold it open at the 86mph top speed for a few minutes. Riding off road or even riding country lanes at speeds around 60 has never been an issue.
Also being one of the bikes with the removable battery has its advantages. You can take them off the bike to charge them, ride with just one for a lighter bike and a bit of space to stash some stuff, replace one if it goes bad, or even replace both in the future with the 3.6kW/h modules to get you the full 7.2 (or maybe even more if Zero ever decides to make more improvements).