>  At the same time I am vary of YAGNI while "designing for the next 5 years". We should strike some kind of a balance.

Agreed.