The choices are, in the same order as SPG shows:
Club premium - "luxury suite, partially separated living room..."
Grand junior suite - "living area separate with partial wall, high ceiling..."
Junior suite - spacious and welcoming living area.."
The square footage ranges are all over the place.
I'd say if you truly got a regular old room with club access or a regular old room on the club floor, you should be asking for a return of your SNA's given the description of the club premium clear says it is a suite: "Luxury Suite, Partially Separated Living Room, Free Club Lou nge Access, Marble Bathroom, VIP Amenities, Espresso Machine."