I had a similar "dilemma." Although wasn't going FI, I decided to keep my Z and I'm glad I did for personal reasons.
I'm not sure how I'd feel about going FI on an engine with that many miles, especially in CA.
My simple answer would be to either get the new Z or any one of it's competitors...lots of great cars have been coming out
Good luck! I don't think you can go wrong.