ADFSDiag has been updated again!
The updated tool can be found here. The attachment contains both 32 and 64 bit installers.
A cool new feature - Claim Flow Analysis has been added to this version. I'll write up a quick blog on how to use this feature soon.