If the original plant pictured had a spike of flowers - the individual flowers of which flower from the bottom upwards - then that plant was almost certainly RBW. RBW leaves are arranged spirally round the stem, as opposed to being set in opposite pairs [common in many other willowherbs].
Both montanum and hirsutum have hairy leaves to varying degrees, hirsutum particularly so. Hirsutum flowers are quite large [app. 1/2 inch or so across] but those of montanum smaller and paler.
As for edibility, hirsutum is not a recommended edible, there being cases of convulsions afterwards. Tried some cooked myself, but found the texture made them difficult to swallow; neither were they very palatable. Young, cooked RBW leaves, on the other hand, make a very good vegetable green, though the cooking water should be discarded.