I prefer using a PF basis and then backporting anything I need from 3.5. Ideally on top of that if there's a PF and a 3.5 thing with the same name (Power Attack comes to mind) I'd consider allowing both.