Hello ,
Something that you might be able to fit into your refactor is flying/hovering units. Similar to the ones in XCom. Probably just need a way to prevent adjacent tiles from hitting with melee depending on the flyers height. Flying may also affect the cover system too. Anyway just a thought.