The computation of compressible two-phase flows with the Baer-Nunziato model is addressed. Only the convective part of the model that exhibits non-conservative products is considered and the source terms of the model that represent the exchange between phases are neglected. Based on the solver proposed by Tokareva & Toro [42], a new HLLC-type Riemann solver is built. The key idea of this new solver lies in an approximation of the two-phase contact discontinuity of the model. Thus the Riemann invariants of the wave are approximated in the " subsonic " case. A major consequence of this approximation is that the resulting solver can deal with any Equation of State. It also allows to bypass the resolution of a non-linear equation based on those Riemann invariants. We assess the solver and compare it with others on 1D Riemann problems including grid convergence and efficiency studies. The ability of the proposed solver to deal with complex Equations Of State is also investigated. Finally, the different solvers have been compared on challenging 2D test-cases due to the presence of both material interfaces and shock waves: a shock-bubble interaction and underwater explosions. When compared with others, the present solver appears to be accurate, efficient and robust.