Thank you for the replies.
as for #2 and #3, I like to keep circuits separate if I can so that I can isolate individually if I ever have to work on it. That's why I wanted a separate circuit for the lighting and the shaver sockets.
As for a new CU, yes, I will have to replace it as I will be...