Whatever you do , just be sure to be firm and to stick to what you want !
I know you love the dog , but he/she has to learn good behaviour . I would attend a good dog-school with the dog !
Success!!