Recommendations Wanted

I’d go Klipsch Forte 4. 

Put the speakers against the short wall firing into the longest room dimension.

Play with setback against the front wall.

Make sure the front third if the room is acoustically treated.

Heavy rug between you and the speakers

If you can, place speakers on a rug also.

Remove as much hard,  reflecting surfaces from the room

.

Tektons do sound good driven but tube gear but due to the low impedance, they are never as efficient in room as you would think, particularly with tube amps.  It is reflective of the standard used to calculate SPL ratings, nothing they are doing.  Just something to be aware of.  
 

I might look at something like the Scansonic MB3.5 B.   The ribbon tweeter behaves differently and creates a more immersive experience in a more traditional speaker design.  This is a ribbon tweeter thing rather than just scansonic.  AMTs can deliver a similar experience but tend to drift a hair brighter though this is not universally true.  

One thing that would help the respondents is to know what it is in your current speakers/system you define as deficient.  Without that, we're shooting in the dark with respect to recommendations.  (In general, though, 40wpc is pretty weak for most B&W's.)

I can't believe you are listening to music 7 feet away from your speakers?