My husband is 6'4", 215 pounds, with a 36" waist and wears a Large. That said, the Pinnacle rep at a local dive show told us that measurements are FAR more important than height and weight.
Based on what you've said, a Large or Large/Tall would definitely be in order.