Any re-edit could not be chronological, as the revelation of Bob's identity is an important plot point that would be ruined by FWWM coming first. I have thought about doing this, using FWWM as flashback material. However, I would probably exclude the entire second season after Bob is revealed.