exp and new level cap !

Hey all ,

I am kinda new to the game and just hit lv 35 today and realized that i need a whooping 26k exp to hit 36 . I was wondering if after the update in a few days , The level cap would become 41 and the exp needed to lv up from 35 to 36 also would fall down .
So my questions are as follows :
1. Am I right ? should i wait for the update ? cause i dont wanna do 26k exp twice .
2. As I am 35 and lets say i wait for the update , would even my exp needed go down like others , or would i still need 26k exp for hitting 36 and again (assuming) another 26k for hitting 40-41 ?

Regards,

Fudge