PID tuning... It's broken, but how is best to fix it?

Well, for my setup the PID tuning works good (good enough for me) but you are right, there are edge cases where it does not yield the wanted results. You might want to check: