L22 would definitely be on my list as well.
DIY will often give you more bang for your buck, but also means doing a little work. Since your current is home built, you have a lot of potential benefit by going with a knockdown kit(s) as mentioned above or building the cabinet yourself if you have the ability to do that.