Mario Gotze is winning his battle to be fit for Borussia Dortmund's UEFA Champions League final against Bundesliga rivals Bayern Munich.