Here's another thing you might look into. Using the B at the 4th fret of the G string and the shuffle notes on the D string above. It's an inversion and just another way to play it. The F# (5th) is the 4th fret on the D right above the B and can be played with a mini bar of your first finger.

It is a shift of hand position and will take some time in getting used to but it's good to know. One of the great things about guitar is that there is more than one way to play something.