Sounds like what you really need is a 172... or maybe even a 182.
They are both good short field performers but will give you lots
of reserve climb ability, especially the 182 if you are worried
about full loads on High Density ALT days.

You might be just trying to fly a 150 too close to the edge of what it
is capable of doing.