Comfirm the specifics with the instructor that you plan on doing the DM cert with. In addition to the skills that you mention above, I recall having to do several additional pool skills and longer swim distances.
Welcome to ScubaBoard, the world's largest scuba diving community. Registration is not required to read the forums, but we encourage you to join. Joining has its benefits and enables you to participate in the discussions.
Benefits of registering include