1 year. This is a random time frame that you have applied yourself?
Or do you feel that you will be placed in a more dangerous situation in the next year?
The self defense element is the most important.
This is not competition - you must select the art most suited for self preservation, not offense.
Your body shape is not the a-typical for wrestling, yet you say that grappling is a natural instinct.
This would steer me towards BJJ or Judo. Leverage and weight manipulation are two key capabilities in these sports and long limbs can be useful for some of the more intricate submissions.
Furthermore, I have good store in these Arts for self defense as you are trained in and use the gi - an outfit more bulky than ordinary clothing. This is excellent rehearsal for SD.
Self preservation should be at the core of any martial art.
Withstanding punishment should not be an option.
Don't be the "hit me" guy.
I feel in the allotted time frame you could learn most in BJJ or Judo.
In one year these sport allow one the greatest opportunity for progression. You are educated as much as you allow yourself to be, the movements are age-old and should you immerse yourself in the sport, you can learn many of them.
There is a less focus on serving your time than there is in the ring or the mat, where the rookie period generally is spent nursing bloody noses or icing your shoulders.
BJJ and Judo are tough sports. But there is a greater comradery than you will find in the others.
I also feel that Boxing and wrestling are sports scored on mastering aggression. Your goal was self defense and I wouldnt select these arts on that criteria.