I am considering moving the batteries from the starboard lazarette to the port lazarette.
Went through exactly the same scenario (with exactly the same boat) last year when my neurosurgeon stuck his finger in my face and said "get a windlass, OR ELSE". Man knows absolutely nothing about boats but I took his advice anyway.
Yes, I've had the same problem as you from day one with the list to starboard. Two house batteries and one starter battery on the starboard side were the cause.
In installing the windlass, I finally got around to moving one house battery (60 lbs.) to the port lazarette, wired it in parallel with the other house battery (also 60 lbs.), and ran cables forward to the windlass from the port battery.
In moving the one battery from starboard to port, it had the same effect as adding 120 lbs. to the port lazarette. The final result was my mast was vertical. The half full fuel tank and holding tank figure into the mix and make for a good balance. It's never perfect as the levels in each tank rise and fall.
Truth be told, I did cheat a little and previously measured how much weight was required on the port side to balance the hull. Used buckets of water and came to 135 lbs. Close enough with just relocating the one battery.