Sounds to me like you sorta answered your own question, now just go all out on upgrades for you current home, Cadilac style and you will be set! My former boss did just that, took a house he loved and sunk his cash into top of the line everything, windows, wood trim, cabinets and made a great home something really special while not buying a house that was too large or hard to handle, as we get older those things really start to matter, cheers.