It looks like adding is_account_connected in combination with needs_setup did the trick for me. According to this logic here: PaymentGateway.php#L58, both would need to evaluate to true.
is_account_connected
needs_setup