Just a general comment, since you might go for the 155-- Geos like real estate, but for the most part (most species, especially 'surinamensis types') it's because they're active and like to cruise and browse for food, not because they're territorial. An exception is when a breeding pair is protecting a spawning spot. Occasionally one randomly takes a liking to a certain spot and tries to claim it, like under a piece of driftwood, but this tends to be when the group is on the small side. Otherwise, species like sveni or pyrocephalus tend to be social species and even show some shoaling behavior if the group isn't too small.
Also: Geo pyrocephalus (red head tapajos) and sveni do quite well with neutral and above pH and moderate hardness. These days I'm keeping my sveni at 7.4, which is where my water naturally settles, but I've kept both sveni and pyrocephalus (which I bred for years) somewhat higher. If your pH settles near 7 there's no need to make it lower. (soft means lower GH/KH).
You may get different opinions, but with one wavemaker, I'd aim it at the surface (if it's two I'd aim one at the surface and the other at the opposite end of the tank aimed downward to create a circular flow). Geos like good oxygen and some current, but taller bodied species like sveni, tapajos, altifrons, etc. don't need or come from the same kind of current as some of the rapid water species.