That could definitely explain the long wakings at night - often they have been discomfort-related here. Let's hope now the tooth is through things ease up a bit for you
As A times get longer you basically choose one nap to keep long, and then gradually shorten the other. So for example a long am routine can go up to about 4h A time:
WU 7
Nap 11-12.30/1
Catnap around 4.30/5 for 30-45 mins
BT 7/7.30
Or with a short morning nap:
WU 7
Nap 10-10.30/45
Nap 1ish-2.30/3
BT 7
Hope that's helpful!