The Homewood Suites downtown is actually on the Western edge of the Riverwalk, near the mercado, and they have some two bedroom suite setups. Getting one on points is entirely another question- they seem to get quite full on weekends.