Exactly! Choose one nap to keep long, and one to gradually reduce. It doesn't matter which way you go, I preferred long am with mine as that fitted better for the day and I felt like I'd got a good nap in rather than risking two bad ones, but it works equally well with a long pm nap for lots of people.
I'd try
WU 7
S 10.30-11.15 (wake at 45 mins)
S 2/2.15 (likely to need shorter A time) uncapped
BT 7/7.30
I'd give consideration to a longer day too actually, many LOs stretch out to a 13h day before dropping naps to fit in enough A time and naps before they can handle the long awake times properly x