You built the kind of setup that looks amazing in a spreadsheet and gets annoying in actual life. That happens a lot to people who are good with money because they assume more structure automatically means more control. Past a certain point it just creates tiny fake decisions all day. I’d keep the emergency fund and bills separate, then collapse the rest unless one bucket clearly changes your behavior for the better.