Berry's Shane Rose makes amends for Rio disappointment with Tokyo success