Thank you both so much for the suggestions! I'll definitely try to get better/smoother joints all around and clip whatever leads are still too long. Resoldering the diodes might be a little difficult, but I'll give it a shot, otherwise I'll go with some electrical tape. I want to note that the ones that should not be in contact look like they're in the same plane, but are in fact bent away from each other.
