W.S.
IMO, you may continue using this grade.
If not satisfied with Toyota brand, then you may change the brand, but do not change the grade.
5w-30 fully synthetic from Shell, Total, Kixx, Caltex / Havoline, etc. are Great, value to money oils.
You may use any of these from next oil change.
IMO, it does not matter, as far as engine oil grade is concerned.
If your car's cat. Conv. is choked, then there is no harm in using it.
Proficar Cat. Conv. Cleaner is another good option.
Or you can use Motorclean services too, for cleaning of your car's Cat. Conv. (if its choked).