I had a 2008 20HP for 5 years and had to figure out the same layout you are referring to.
To gain room, I moved the battery trays/batteries further port/starboard and gained enough room to accommodate.
I ended up also rotating the oil reservoir and placing the pumps right next to it and I also mounted my stealth to the firewall, similar to bassfreaks layout.