How to figure a healthy weight gain in pregnancy if I’m also gaining muscle?

The pregnancy weigh calculators are so hard for me because BMI doesn’t factor in muscle mass and I workout and put on muscle quickly. When I got pregnant I was lean, had visible abs and was strong but my BMI was 25.5 which labeled me as overweight 🙄 which means I should only gain 15-25 lbs the whole pregnancy?! I don’t think so. Then in my first trimester I couldn’t get off the couch for 6 weeks and couldn’t eat anything other than carbs. I could tell I lost muscle and put on fat during that time which lead to a 5 lb gain in the first 7 weeks but felt like more since the scale was showing my loss of muscle. Now I’m in my second trimester and can eat normally and workout again and I’m feeling good. Im 14 weeks now and only gained 2 lbs since 7 weeks. My legs feel thin from all the walking I’ve been doing and I’m starting to get my leg muscle back, and my arms actually feel like they’ve thinned out, even though I’m still gaining. How am I supposed to account for muscle gain during my pregnancy? It’s not like I’m doing anything crazy or dangerous, just uphill walking and training with lighter weights and less reps but I can still tell my muscle tone is coming back. How do I factor all this in?

Ps this is me last year after the holidays. The pictures are only three weeks apart and you can see the difference in muscle tone. Scale says I only lost 2 lbs in these pictures cause of the muscle gain.