It will be safe for you if you do the demarcation. Because after demarcation the matter will be closed then and there.
But if in future your neighbour approaches court then it will take too long for the case to get decided. And till then maybe yoyr eextended construction will be stayed. And property under dispute cannot be sold or transfered to anyone.
So get the demarcation done. Its safe and easy option.