I think most agree that the precap was a dampener...however I'd disagree with your interpretation of the sword scene too...
If the sword fight like was one in the movie (Where the HR Jalal there is obviously smitted with his AR Jodha and Jodha is obviously disappointed in her husband) then it'd have made sense...
here it was obvious that he just drops in on her when she's practising...what made the chemistry rock was these two individuals and their stares...the scene was not intended to be a romantic one...it was intended to show them at 'loggerheads'...its a power-packed hot encounter - not a romantic one!
Its no secret that Jalal is attracted to Jodha's beauty so observing a tinge of lust/admiration in his gazes is not uncalled for...however, the entire duel was about Jalal not being able to understand this young lady and where she comes from...also, the thrill of a duel with his own wife which he possibly has never enjoyed...
I think the quintessence of all of it came down to Jalal asking her
'I don't understand why you asked for the pardon of a slave and wasted your opportunity when you could have asked for your own freedom'
and as for sword practise session itself, (whether Mothi Bai was saved or not) we know Akbar does it everyday and Jodha maybe every now and again...so there shouldn't be a particular time or instance when such a scene should have to be portrayed...just my 2 cents...😳