The RAV4 PHEV is a good option if you don't want to go completely EV.
We're looking at the Toyota Venza, which is a hybrid, and more luxurious than a RAV4.
Another option I'm seriously considering is the Hyundai Ioniq 5, which is coming soon. From what I've seen and read about it, I'm impressed. It's supposed to start around $45k. If it's below $45k, it will qualify for the proposed $5k instant rebate in NJ. Combine that with the $7500 tax rebate, and NJ's proposed $500 towards a level 2 charger, and I'd be sold. Hyundai are also offering free charging for two years, although I doubt I'd use it much, considering how easy it is to charge at home.
I do think battery technology and charging infrastructure will improve in the short term, which is one reason I'm still considering a hybrid over an EV. I just read about upcoming battery tech that will improve charging times (by lowering temps) and extend range by at least 5%. Not a major change, but still.