I think I'll try and deal with the CaCl a little better in the blend batch (the original I was at 2:1 ratio), I just don't want to expose the current brew to O2 if I can avoid it. I will give it a go in a glass, just got to do some math to work out the amount relative to the glass.You could always throw a little CaCl in a glass with it (and then in the keg if it works for you) to help with the mouthfeel.
Yep, I think the FWH is what stuffed it, I won't do that again for this style..I would personally either halve or get rid of the FWH altogether and move the IBUs to a late/whirlpool addition.
..