I was overweight when ttc and actually put on some when I got a bit down in the dumps following my 2nd m/c.
During this pg, so far I have only put on 4-5 kilos. My OBS doesn't even weigh me and he has said nothing about my starting weight or asked how much I weigh now.
It sounds like u have a good attitude to exercise and food and I wouldn't change any of what u r doing now. The only thing u might need to consider is that some hospitals won't let u deliver if you have a higher than 30 BMI (??).
Good luck