Technically your allowance should be 30K for the J sectors and 20K for the Y sectors. Whenever I upgrade, the sticker (for a paper ticket) on the new sector shows 30K while other sectors remain 20K. With that being said, if you explain your situation to the agent they usually won't be too fussy.
Cheers