For PokeGyms' its a separate badge if you're challenge me using another type as I am no longer the Normal Gym Leader there.
As for Trinity, if you haven't beaten my Normal Gym there, then yes, you'll still have too.
Also, sure I can battle now, just let me know which League and Gym you're facing.