So here is my fairly well researched take: put a 17.5mm PHVA on the bike, don't worry about doing anything to the intake at all, it's fine. Jetting with a pod filter will be around 20 idle, 40 slide, a7 needle, and around a 92 main jet, give or take. Swapping to the larger carb will not really net you much higher rpm ceiling but correct jetting will. Also gearing with the Streetmate is a bit wonky because of the larger tires so yea a 24T rear is equivalent to a 22t rear on a spring or otherwise. You don't need to switch back to stock stuff, just run what you already have, it's fine, It will vibrate more than stock but should pull a little harder with slightly higher top end rpm. Good luck!