Maybe, depends on what your looking to spend? Since we built the other rig I have little use for Hot Water. I have 2 Pressure Pro 8/10 gpm Hot Boxes with new thermostats and flow switches. They burn real clean and have no issues, so send me a private message and will talk.