In basic static stability, you are dealing with calculations based on the given design characteristics of your boat
TPCN (Tones per Centimeter Immersion)
CG…Centre of gravity
PP… Pivotal Point
Rather than getting into all of that, a practical and easy test is to use some large garbage buckets, measure or weigh them full of water and play with Changing your trim within your present condition by moving them to different realistic positions and refilling.
This gives you the amount of weight and optimum position; you need to move weight forward down below to improve the trim.
Make a spreadsheet when you measure it with full crew and full tanks simulated on board and then when you are close to even trim, make a note of “bodily sinkage” (Your new draft)
On your size of boat, stuff like this can change the boat’s trim and performance very easily, so putting extra water up forward or shifting house batteries more forward will help, but do simple tests first with water jugs under the v-berth first, go sailing in some weather
to get a feel of what all this added weight does to handling, before committing to a permanent solution.
You will have changed the “dynamic” stability and while it may feel a bit wetter, it is probably a compromise you will learn to accept.