Realistically Barnes makes more since because he would get to start, I'd assume they amnesty MWP since he opted in or he is regulated to the bench. Bogut's deal is only on the books for next year so it wouldn't interfere with the 2014-2015 nuclear option of just throwing cash at the prospective FAs those years (Bron, Melo, Love, etc.) Barnes had a great unexpected 1st year and would be a nice consolation prize if Dwight walks.
That being said, I truly believe Dwight is staying and if he does leaves it's going to be to the Rockets not the Warriors so it doesn't even matter.