Well, I replaced the countertop with one made from Baltic Birch Plywood. A solid surface one may come later, but I needed to see how things would fit. Everything is shoehorned in there and just fits. Now I have a template to give to someone to make a solid surface one with the same mounting scheme I used. I will post more details later.
I also replaced the fridge with an efficient compressor fridge and replaced the sink with a stainless steel sink.
There is not enough room under the cooktop for one that sits flush with the counter, so I just cleaned up the one we had and added a spark ignition.