The only thing I would hope they fix, but know they won't, is the sudden appearance of thermal clips out of nowhere in ME2, and how all the "old" weapons just, vanished into the ether.
The way I picture it, the best option is to "merge" the two systems into one. So guns can still overheat and...