Ceiling rose with twin wire, no earth?
If your luminaire has any mettalic parts it needs to be grounded unless it is double insulated.

Your plan to replace the 2 conductor cable with a 3 conductor cable (2 conductor with ground) is probably the best course of action. Even if you current fixture has no metal parts you may want to change that in the future.

Good luck!