My personal opinion is that the Diver's belt buckle should never be seen, so I think what you have there is great. Like Fett with his knees upside down in the carbon freezing chamber, I believe any time the buckle is seen is a costume error.
The girth belt straps should be pretty easy to jockey around into position. This makes me realize that I'm gonna have a tough time when I have my wife suit me up for my approval pics next year. I'm gonna have to print out the CRL and hand it to her. "You know I love you dear, but I don't trust you to do this right. Make it look like this."