A two-dimensional Riemann solver with self-similar sub-structure - Alternative formulation based on least squares projection