Reducing the Senate's powers to something more in line with the functions of upper houses in other democracies is actually a much better idea than making it effectively House 2: Electric Boogaloo. It makes sense for a federation to have an upper house that represents its constituent entities, and there's little point to having an upper house that's selected in essentially the same way as the lower house.
Yeah, I basically agree. If you can amend the constitution, amend it so that the House takes up the Senate's confirmation abilities for judges and executive appointments, for instance.