Yes, correct...

( stated generally: multiply or divide IFR or stoichAFR by inverse scale factors )

i.e as you have it, set B4001 to (IFR * X) and set B3672 to (stoichAFR / X) where X is 0.799.

Yes, please use EQR.

( I use EQR for commanded fuel, and Lambda for exhaust measurement... this allows me to avoid confusion when speaking )

Post your calc_pids.txt here.