Found in the front garden today, on a not quite yet in flower Epilobium montanum that had (until today) escaped the weeding regime.

I can't quite reconcile what's been found with any of the species that affect E.montanum.
Definitely not Puccinia epilobii, as the spores in my find aren't teleutospores.
Doesn't match Wilson & Henderson's descriptions of uredosori/Uredospore stage of Puccinia pulverulenta.
So, might this be the uredosori stage of Pucciniastrum epilobii? (Not one I've yet seen).
Just that I wouldn't call the spores (certainly on the evidence of the dry spore shot) "remotely and shortly echinulate" (as per Wilson & Henderson's description).
Most of the sori were tiny orange "pustules" (as seen in the second shot), containing "clumps" of spores. However, there were also a few scattered pulverulent sori, where the pustules had split open, leaving tiny dry mounds of spores on the surface.
Click on images to view at full size. Any thoughts will be much appreciated.
Regards,
Mike.