As
@Andydragon says, BMI is a blunt tool.
There are always exceptions.
Geoff Capes was often quoted.
However the true test was if the person was built like Geoff Capes and could tow an airliner along a runway!
"The race is not always to the swift, nor the battle to the strong, but that is the way to bet.".
Or, take BMI as an initial target and then apply the exceptions afterwards.
Most people will be the correct weight when in the normal BMI range.
Also, aiming for "Phew! I've JUST scraped into the normal weight range!!" is not always the best target.
Better to be well withing the Normal range for whatever measure you decide to use.
My BMI is around 22.4 and seems reasonable, although I could always lose a pound or two.
I don't do enough upper body exercise to put on serous torso muscle.
My main exercise is cycling so the muscle is on my legs.
Anyway, keep doing what you are doing. It seems to be working.