I can't speak specifically to diving but I am also going to be in Vietnam in July and was originally planning on 5 days in Nha Trang. I have some friends living in HCMC and they advised against it. They told me that they recently went and the city was dead and boring. Apparently tourists just aren't returning there post covid. I ended up reworking my plan and will spend some extra time in Thailand and Bali before going to HCMC.