Quite. We should be using 'guy' to mean specifically male Catholic would-be revolutionaries who failed at the last moment, were captured and executed, and get burned symbolically on an annual basis. Or perhaps their mannequins. (That is, after all, where the term comes from.)
It has already expanded wildly in meaning since those days (even in the UK, where that expansion is relatively recent): I don't see any problem with its expanding a little more.