Probably a lot of work but you should consider making a room based design too. That would help with scrolling issues for the moment. Example have an option to game settings for room based and choose how many pixels horizontally and vertically to change to next room.
