If the Bolt's range and charging options won't work for you, then my vote is for the gen2 Volt. I took one for a spin and quite liked the way it drove, plus the Apple Carplay/Android Auto should treat you better than your Prius' nav system did.
The CX-5 would probably be my choice if I had to pick a small CUV/SUV.