Back again! Am I right in thinking your DD is 3 months and a bit old? I could be horribly wrong, but looking at the night wakings after only 90 mins and 30 min afternoon naps....could it be OT?
For us what worked (ish!!) was this: get rid of the OT. If this means APing, then go for it. Long car ride, stroller, whatever works to make sure DD gets a good stretch of sleep. Then gently tweak. Pick one A time and play with it, but gently. So say your morning A time is usually 2h10, instead make it 1h55 and see what length nap you get. If you get a long nap, then stick to normal A time for the next cycle. If you get a short nap (eg 45 mins) then shorten next A time by 15 mins. And so on. Make sure you include in the A time the time it takes to go to sleep.
If you get a good, long nap then lots of stimulation for the next A time. Using this method, I usually (okay, often!) get at least one 90 minuter.
Wake to sleep never really worked for us - it was more like Wake Too Early. But it might be worth a try?
HTH
Emma