If you enjoy CelebrIty’s ambience, go with Beyond. She looks an absolutely gorgeous addition to the fleet! Speciality dining is still extra but sure you’ll have plenty of OBC to cover that being in a Suite. They also offer a better suite product IMHO with both a dedicated indoor and outdoor area plus a dedicated restaurant Luminae.
Not saying Virgin wouldn’t be great also, I think you cant go wrong giving them a go and decide which one you’d prefer to book for your next cruise!