You may be running excessive air in the suit. Try opening the suit vent all the way and frequently roll a bit right to let it vent. You'll need to use your BCD for any additional buoyancy needed. (If a wide open suit vent feels much too constricting after trying it that way, then run it a few clicks tighter.)
I've no idea if this applies to you, but if you're trimmed to be fairly diagonal, then you'll need more weight to be able to counter the upward component of your kicking. Being more horizontal may allow you to drop some weight.
As always, check how much air is in your BCD at the safety stop with the tank near reserve pressure. If it's not pretty empty, then drop a little lead for the next dive. Depending on your current underlayers, you may be able to get lower-buoyancy materials for the same warmth. These typically come at a premium price, unfortunately. At the end of the day, though, the temps will dictate the layers, which will dictate the ballast requirements.