How to enable freestyle edges on top of freestyle faces?
I'm not sure to get it perfectly, but you can set freestyle to only render edges specified as "freestyle edge", like this



if you use face marks (here in blue)



you can use it to (eg) exclude some parts of the previously marked edges (also blue to make them more visible):