Gas tank skid and pinion angle question

So decided to dive below the heep today and found this......



Is it worth it to upgrade to a better gas tank skid or will a factory replacement work? No rock crawling here.....maybe just some light trail riding. :)



Also.....take a look at my pinion angle....









Do you think this will cause a slight vibe?