Are you getting used to playing shuffle?
It's never easy to get used to it so keep practicing with video. Copying the same as I am playing is also a good way to practice.
13-15 bars and 17-18 bars are taken by left-hand. Doesn't it feel new? So it's never bad to make a change like this. This is a song that's played a lot in a church, so if you practice hard enough, you would be able to use it well in practice.