Dan is desperate to repair his friendship with Diags, but it remains to be seen if they can patch things up ahead of their joint party and rekindle their once powerful bromance