Two things come to my mind that you can try.
One is that you can swap the feeding with the solids, so you BF first and only about an hour later you give him solids. It can be that because he is taking solids first and only later BF that he full from the solids and doesn't take enough milk.
The second thing you can try, because it's only 2NF you try to get rid of, is to shorten them by a minute every 3 nights. If it takes him now, say, 15min to BF at night you are going to shorten it to 14min, stick with it for 3 nights and then go down to 13min and so on. By the end of it he shouldn't wake up anymore for feeds and if he would wake you'd know for sure he is not hungry because you gradually transfer those calories from night time to day time.
Saying that, I am not sure if he is going to be able to last a whole night with no feed... Some BF babies still need a NF till much later on.
It could be that the NW have to do with his routine, so if you'd like you can post your EASY and we can have a look if he is getting enough A time. It could be that 3.5h EASY cycle is not enough for him anymore.