%Bodyfat and shifting Goal Posts

I am trying to calculate my target weight based on Body fat but it seems to be a bit of a mine field.

I'm currently 6 foot, 212lb and around 22.5% body fat. I do a combination of HIIT, weight training, swimming and running. I'm currently eating 1500 as a base and add in around 70% of exercise calories on training days. Most days I achieve at least 1g protein / lb of lean body weight

If I calulate by current lean weight as been 77.5% of my current body weight (i.e 100% - 22.5% fat)

so 212 x 0.775 = 164.3lb lean body weight.

Now I have a pretty lofty goal of 13% body fat

so 164.3lb x 1.13 = 185lb as a target weight.

So far so good right...

Am I right in thinking that my lean body weight will increase as I build muscle and thus my overall target weight will increase as get closer to it?

Any clarification would be appreciated.