Good choice dividing the weight between belt and Bp. Since you're in a drysuit though, I think you should plan for a flood and loss of buoyancy, in which case the wing may not float you. So yes, bigger wing seems like the choice.
For the purposes of a recreational realm if you know your undergarments can withstand getting fully saturated and lose all it's buoyancy characteristics, you could treat it as you would a wetsuit. You know you will always have that extra buoyancy in the undergarment itself so depending on how much that is, you could decide if the wing is enough; and then just mention to the instructor that he should invest in a float.
Fundies might say differently though.
For the purposes of a recreational realm if you know your undergarments can withstand getting fully saturated and lose all it's buoyancy characteristics, you could treat it as you would a wetsuit. You know you will always have that extra buoyancy in the undergarment itself so depending on how much that is, you could decide if the wing is enough; and then just mention to the instructor that he should invest in a float.

Fundies might say differently though.