I really like your branchline plan. The main part of the layout does get a lot track into the space.
How old is your son? He may develop an interest in operation soon too and forget about continuous looping. My grandson is 13 and has evolved in the last few years from having an interest in operating my continous run Lionel layout with a few routes and remote swtiches. Now he wants to run/operate trains on my 2 rail layout which is point to point and totally focused on operations. The operations have a through freight in each direction (from staging) which deliver/pickup cars at a yard. Then 4 local freights move cars to and from the yard to industries on the layout. This is all done with an automated car routing system that generates switchlists. The point is once my grandson started running one of the locals and figuring out where and how to switch the cars, he likes doing that now and ignores the opportunity for continous running.
My recommendation is make getting the branchline trackage in a priority. And from the style of that trackage, I think you could use manual switches since it is "walk-around:.