California King is the best for my height, but I would recommend just a King as it's harder to find sheets and bed frames in the California King sizing.

But yeah going up from queen was a great thing for my ability to fit in a bed!