Honestly, he seems to be taking plenty of milk (has his milk intake dropped much since starting solids?). I presume you're keeping the DF of 240ml a while longer?
You may want to look at increasing his A time, especially first thing in the morning. How long has he been on 3hr? Am I reading right that he's only up for 2hr before his afternoon nap? Often an EW is related to too much day sleep too early in the day.
When you did W2S, what did you do, how long for? When he wakes, what is his demeanour?