Yeah, don't use the calculator. As far as the points, I actually like the change as it will likely benefit me since I kind of end up in the really terrible corner or having to use expensive discount Y fares which still accrue basically nothing for PE but will get me more avios now. I'm also based in Madrid so my situation is pretty unique.