Georgie, from your first post it sounds to me like he is ready for a 4hour EASY- I knew the time was right with Alex when he just didn't want to eat, even after 3,5 hours. Moved him to 4hours and bingo- in 4 bottles a day he ate more than he had been doing in 5 bottles a day!
Re his first feed of the day- I knew it was time to wean Alex's night feed when he started not wanting his first morning feed. I cut out the night feed and immediately he fed better in the day, he was just hungry for it at the "proper" times. I know you have recently dropped the 5am feed, but if your lo is 17 weeks he could well be able to handle no night feeds at all.
Also might be worth trying a bigger teat like Jill said. If he's choking on BF but not on the bottle it could be that the teat is too slow and your BM flows faster than that, kwim?
Hopefully it's as simple as that and there's no underlying health issues- fingers crossed!
xx