Yes, definitely keep safe. But I don't think it's really necessary to go extra-underground, if you see what I'm saying. If you keep it on the level that you've had it, I don't see any reason why there would be any problems.
You must do what you feel is right, of course...

In the meantime, it's great that you've gotten that help. I'm glad the Analysis Droid scene is fixed up!