Both are fine choices, if I were looking for an upgrade I'd be looking at both as well. Both manufacturers have their advantages, for example Newmar with their customization capabilities and Entegra with their 2 year warranty. Both have their disadvantages as well, well documented in threads on this and the Entegra forums. Overall both are very good at what they do and are among the few best motorhome manufacturers IMHO.
Good luck in your search!
Stewart, Brenda and kids
2008 Newmar Canyon Star 3410, now at a new home
2006 Roadtrek Versatile 210