I've got 2 suggestions, but I don't know if either will really work.
1 - try not to feed twice at night. For us, the multiple night feedings weren't being helpful with daytime feeds, so I've been trying as hard as I can to resettle at night without feeding (though we still have 1 nf that I'll be keeping for now). Back when DS2 was younger and was taking 3 nf's I started getting better naps when I started resettling one of his nf's, and I think it was related since it forced him to take more during the day (plus the 3x at night was more than necessary for him at that point when we stopped). I also feed at wake up in the morning (and I try to resettle if he wakes before 6:30) since this way, his next feed is closer to his nap wake up, I found the delay in feeding in the morning hard to maintain throughout the day.
2 - try as hard as you can to push off that first feed. Even if he seems to be waking hungry, it's possible he's becoming a snacker and needs to be pushed a little in order to take more at each feed. With a 2.5 hour A time and a 1.5 hour nap, you'd have an ideal 4 hour easy. It seems like you're thinking of going from a 3 hours feeding to 2 hours or so, but it looks to me like you need to try gently pushing him to longer between feeds. I know pushing the feeds later isn't easy, but you can either try holding him while you wait to keep him a little happier, or try to resettle his nap, so that he's waking closer to 4 hours later than his previous feed. Resettling naps is so annoying! but with DS2 I found that he really needs the longer nap (he was doing 30 minutes for so long), and though it may take me 45m to resettle him, he will go back to sleep for 45m to an hour or so afterwards, after a few days, he's become more consistent with longer naps by himself (but not always). Sometimes I feel that if I do things with DS2 once, he will try for it again, so if I feed him at a weird hour at night, he'll wake up at that same time again the next night, but if I don't feed him again, he won't bother waking up at that time again. So it could be that if you keep feeding at 10am, then your LO is waking for that feed out of expectations to eat, rather than necessity. With DS1 we also found 4 months a successful time to start extending his naps by resettling him.
DS2 is now 18.5 weeks, and is about 16.5 lbs, he's exclusively BF, but has 2 EBM bottles during the day at his sitter's house (about 6-7 oz in each bottle). We're on about 3h 45m EASY with an A time of about 2 hours (give or take, his sitter isn't always consistent with this and his cn at the end of the day is usually after a much longer A time).
Not sure if these ideas will be helpful, but just things that have been working for us. Good luck!