Hun, try not to stress about it too much - messy things happen when they are in the transition. If you think she is better on 1 nap and the night wakings were due to teething, then there is no harm in going back to 1 nap. If she goes back to long night wakings, you can always go back to 2 naps. If you see its too hard to AP the catnap or its getting too late, then it's probably better to do an earlier bedtime. As you have probably seen from the 2-1 support thread, many bubs are doing the same thing and sometimes there is no easy answer and its about riding things out. As you are working on extending her A's - be open to doing an earlier bedtime and that she will skip her afternoon nap or you might have to AP it.
Try putting her down for morning nap a little earlier (10.30am) as per sample routine (which S's mum said worked really well for her too) and there should hopefully be enough A to squeeze in the catnap.