Yes, Tirion makes more sense.Not Valimar. Tirion. This picture (probably) shows the Calacirya, with the Pelori mountains flanking the hill of Túna and the city of Tirion. The Two Trees seem to be in the background.
I recently read (on Reddit, uncorroborated, so take it for what it's worth) that the Tolkien estate has relaxed its permissions to allow for the inclusion of First Age stuff.