You are assuming a 5% growth year on year - I am not sure this is very realistic over the long term: sure right now almost everything is trending upwards, but you are bound to have stagnant or negative growth years.
I think adding value through renovations is a great idea especially given you...