There's a bit of room as the 8.4v rattles a bit inside and I'm sure I've seen a YouTube video of someone putting a 9.6v in a g36c, just not sure which manufacturer it was.
Failing that, there's a bigger handguard for a larger battery but if a 9.6v mini does fit and lasts as long, that would be my next upgrade.