yeah thats a weird thing. my ribs are showing a bit when i extend/stretch and I don't even have a six pack yet.
you seem very conflicted. I would start with a recomp approach, either IF or UD2.0 depending on your lifestyle, and then see how you feel after a month. At that point it'll be very clear what you should do.
You'll either:
1) Be happy with your slow muscle gain/loss and continue
2) Be able to decide which you care more about and know exactly how to tweak calories to get it.
But remember. Count count count count, record record record, especially if you're carb sensitive (which I don't think you are, but in a recomp, this becomes more important anyway, the type, quantity and timing of your carb intakes.)
check out my training log, as bluejacket and I have been chatting about recomp and cutting/bulking approaches in this record. we seem to agree that cyclical method (IF or 24/24 or ud2.0) works best.