I have the same use case of repeating and non-repeating groups.
I'm using Infopath 2010 and SharePoint 2013 List.
I'm not familiar with how you are doing the paths...can I see an example of two fields to help me better understand?
Thank you,
Nathan