first, let us kow ur gear shifting issue resolved or not?
2nd , u need to promise that you will not try to top up oil before oil change is due.
3rd, just shift to 10W-40, which is not very thin, and observe fuel economy and performance.
if u find any issues, u can simple shift back to 20w-50.
now wait till oil change and then report back!!