Same goes here Andy.
I've pledged not to go back until that shambles is sorted. At the end of our holiday that experience marred the place for us. Paphos is beautiful though, a real fan of the place.
If you're going to PFO then i'd recommend flying in on a non-Tour Operator flight, otherwise prepare for it to take around 3 hours to get through the place and then a race to the plane to make it on time.