Feels a bit like the author wanted to have their cake and eat it too with this ending. I don't mind harem endings, and I don't mind endings where only one person gets chosen but having both at the same time leaves a bit of a bad taste in my mouth. Firstly, introducing the whole returning plot-line in the final chapter only to immediately reverse it, and then having all the agony over choosing someone that started the whole manga ending up being completely meaningless in the end anyway, it just doesn't read well.
Honestly, yeah, it almost feels like an axe. I mean, there was no build-up at all to it all, nor a real pay-off. If there was a 4th volume, we could have some time to feel the weight behind who Machino chose, then possibly reintroduce all the other girls because, in the end, she couldn't choose
one.
The final chapter can just be wholesome and gay, while also kinda having both point, given the fact that we would be lead to believe that she finally chose. But I mean, most of what you complained about is likely still in this version.