Yes BPW and BPC are same.

The way your doing this is correct. But you have to remember whenever you reduce the BPC you are taking away fuel. These calculations are for correct size injectors on engine rated HP so a little fudging is in order. Also the lower BPC is the higher the RPM will go before injectors going static = always open.

WHen doing your data logs at WOT high RPM watch Injector Duty Cycle % in history tables.