Yes. Plus, the dialog you cited, Montauk, was in a deleted scene that was included with the "Saga" version. Perhaps at some point in an earlier script, FFC had intended to shoot additional dialog twixt Sol and Tom, with Sol threatening to kill him. Or, it may have been filmed and dropped.
Either way, it's good it wasn't included. Sol killing Tom would have killed any chance whatsoever of Sol making a deal with Sonny.