About civ tweaks, there are only two civs where there are problems : Songhai and China.Sorry to ask again about how to implement only some of the changes and especially about civs tweaks.
If I play with VP + 3/4UC + PDan's tweaks + Hinin's tweaks... How to know which one will supersede the others? Should I delete some redundant changes from PDan's to try Hinin's?
Songhai is mostly about details (war canoe promotions etc), but there shouldn't be much concern to have. For China, you have to choose between pineappledan's version and mine. You simply have to delete the file (or move it elsewhere) marked China in each of our tweak files.
I decided to not really touch the skirmisher line in my warfare rework, so you there shouldn't be any problem on that front.