Extra credit, learn it in two places. Even if the second place is just open chords. Practice switching between the two while playing the same verse. So 1st time through play the bar chord A or what ever your root is, then play an open A the next pass through. It might sound like extra work, but really if you can play your open chords its not.
Its kind of like the second video you made and had a hard time switching the same minor chord up/down the neck. After realizing that, the next time through it just worked. Start trusting your muscles do to what you have thought them, when you need to make a D or a C, just think it, don't start telling your "fingers" what to do, let "them" do.