Ammy: From what i've seen, if you have a user on either your friends or your watch list, then neither link to add them will show up under the avatar anymore.
However, the same buttons are still always going to be near the top of the screen in those big blue radio buttons when you're viewing someone's page. Adding to friends is the button on the end: "マイピクに追加". So, if you want to add someone as a friend that you are already watching, this is what you'll have to go to.
Pesco: What all do you want to have sorted out?