Improved two pair hand scoring