As MaxMidnight said, try bleeding the clutch (#1) or a total fluid change (#2). That's after the oil change. You did the oil change, time for #1 and/or #2.
If you notice the engagement/disengagement point is coming back closer to the handlebar then you may have a worn master cyl seal, worn slave cyl seal (both are usually going to leak brake fluid through you can also have an internal seal leak) or air in the system.
Watch for fluid leakage under the bike around the left footpeg. That would be the slave cyl leaking.
Your bike should have the 'better' shift star segment of the shift drum. Losing pins from that could cause loss of gear selection capability. It could be one gear, some, or all, depending upon how many segment pins popped-out. Again, your bike should have the better design already and not require changing, assuming it is intact/unworn.
Shift fork issues are usually a high mileage issue. The shift drum can also wear under that type of use, and once apart the wear to either is easily seen. That requires case-splitting. The channels of the shift drum for the shift fork movement, when worn are very evident.