Should I someday need a new dive computer, I may be looking at the same 2 you are. If I were buying now, I'd take close look at the rechargeable vs. non-rechargeable issue, because the pro.s and con.s may matter.
1.) I've never had a flood from swapping batteries in my old Oceanic Worldwide VT3, but find the process nerve-wracking, and I never know if I did it right till I dive with it. Every time I open and reseal the battery case, I risk compromising the seal and causing a flood. With a rechargeable battery computer, like my old Atomic Aquatics Cobalt 2, that is not a problem.
2.) But rechargeable batteries can lose capacity over time; there's a decent change you'll eventually need to have that thing replaced, which may involve sending it in and paying a chunk of money. Plus, from what I've seen, rechargeable batteries don't last nearly as many dives as non-rechargeable (and if you've got the lithium battery non-rechargeable option, I assume that really gives long life). So while recharging is easier than a battery swap, it happens far more often.