In cases like this, my solution is usually to take the action that is safest, and causes the least inconvenience to all involved. I think I would have done exactly the same thing, let the fw get out of the way, and then proceed. ATC should never have allowed the situation to develop, but mistakes are made, and we have to deal with them the best way we can.