The routine when you were overseas sounds more typical for her age, I wonder what was different there?...did you put her down for naps at the same times?
Both of my kids have been lower sleep needs (LSN) & needed less sleep than average but at this age, both still had around 2 hrs day sleep - usually as 1 short nap and 1 long one- and an 11hr night.
I'd play around with the timing of the first nap to try for a longer nap then..maybe try it at 10?
Or...If you can only get a 30 min morning nap 10.30-11, I'd maybe try starting 2nd nap around 2 & see if you get a longer one.
She shouldn't need that CN when having her evening feed at this age,& it might be contributing to her going to bed later and sleeping a shorter night. It suggests to me that she needs at least one longer nap in her day.