Yes, that looks fine to me. I'm sure diodes must exist for the voltage and current rating you'll need in a Heavyweight.