All those 4 things are good to do and will add value. The order in which you do them is neither here nor there IMO.
One Q for you though: Will the existing tenant pay more rent once all done?
You've been concerned about them staying on. I'd be more concerned that they won't pay more in rent.