HEAVY BARYONS IN THE QUARK-DIQUARK PICTURE