As I said, there is nothing clear-cut for your situation.
Personally, I think I would be aggressive and claim it all as your home, because at least PART of the garage (the non-addition part) was considered as part of your residence before it was converted to a rental. But that is only what I would do; as far as I know, there is NO clear guidance for what to do in your situation.
