No, it is not OK for you to fit a Master Socket because that is BT's 'demarkation point'.
If the old style box is giving you a problem you should have BT replace it with a modern NTE5 box.
BTW, I am not sure that you do understand the 2,3,5 wiring as that is for extension wiring.
T
January 2009