Hi April!
When looking at their A times we always look at their adjusted age. 2h would be age appropriate for them, but could also be a touch too much. Have you tried putting them down after 1:45h A time? Would they do a full restorative nap (1.5-2h)?
If you do 1:45h A time and they only nap for 45min-1:20h long naps then the 2h A time is probably right for them. When DS was younger, till he was 1yo, the last 30min of his A time was hard. I had to basically carry him around to keep him awake and whenever I thought I knew he is tired enough but it wasn't his usual time I'd get UT naps, so what you are experiencing can be a natural thing that many babies do.
I really think that at this age NF are still important. Very few babies stop NF at this age and usually they do it by themselves (not parents weaning). If it takes you so long to settle them back to sleep than it sounds like hunger to me and my advice would be to feed them and to wean again when they older.
HTH